diff --git a/Makefile b/Makefile index 5ba049774e911b81f3e0c6bdf2534f8331d64059..c2ad6efc9b84d2d0506452cf5784d86e783ce6de 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,13 @@ -.PHONY: clean +.PHONY: clean docs all: build clean: rm -rf ./site +docs: install-deps + python3 ./dockerhub/release.py + install-deps: sudo pip3 install -r ./requirements.txt diff --git a/dockerhub/_header.md b/dockerhub/_header.md index 95d75a7e5a8336ef34cf32516154ab8f478eb2cc..11d6a0d3164d9eb3a518264956132c3286541c84 100644 --- a/dockerhub/_header.md +++ b/dockerhub/_header.md @@ -11,7 +11,7 @@ # Supported tags and respective `Dockerfile` links -* [`1.1.1`](https://hub.docker.com/repository/docker/dbrepo/REPOSITORY/tags?page=1&ordering=last_updated&name=1.1.1) +* [`1.1`](https://hub.docker.com/repository/docker/dbrepo/REPOSITORY/tags?page=1&ordering=last_updated&name=1.1) * [`latest`](https://hub.docker.com/repository/docker/dbrepo/REPOSITORY/tags?page=1&ordering=last_updated&name=latest) # Quick reference (cont.) diff --git a/dockerhub/client/__pycache__/Dockerhub.cpython-38.pyc b/dockerhub/client/__pycache__/Dockerhub.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0e4cec539f15d2d68f79aeb91fe82d368f051d64 Binary files /dev/null and b/dockerhub/client/__pycache__/Dockerhub.cpython-38.pyc differ diff --git a/dockerhub/client/__pycache__/__init__.cpython-38.pyc b/dockerhub/client/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f959c9fd34db2c1e7fc81794994ae038be64140a Binary files /dev/null and b/dockerhub/client/__pycache__/__init__.cpython-38.pyc differ diff --git a/dockerhub/fda-ui.md b/dockerhub/fda-ui.md index 2a8b696bb4e87982ff530b62bc4cee7e05b5691c..8a82929d829dcea884a4f3821beb33d0b59b872a 100644 --- a/dockerhub/fda-ui.md +++ b/dockerhub/fda-ui.md @@ -29,7 +29,6 @@ Change the default behavior by setting the following environment variables to di * `KEY`, optional. The private key of an SSL/TLS certificate to be used by the webserver. The key needs to be a single-line string and - can be easily prepared by the command line: ```console $ sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' /path/to/privkey.pem @@ -44,6 +43,21 @@ Change the default behavior by setting the following environment variables to di $ sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' /path/to/cert.pem ``` +* `LOGO`, optional. + + Relative path to the graphics that should be displayed as a logo in the left pane. The path is relative to the mount + point in the `docker-compose.yml` file. For example add in the `docker-compose.yml`: + + ```yaml + fda-ui: + ... + volumes: + - /tmp:/tmp + - /logos:/app/static/logos # <<< add this line, must point to /app/static/logos + ``` + + And place the logo on the host at `/logos/logo.png`, then set the value of `LOGO` to `/logos/logo.png` + ## Graphical Endpoints * **FAIR Portal**: diff --git a/swagger/api-authentication.yaml b/swagger/api-authentication.yaml index ed46efa13530a5bf8a5a2375712b65f163882bec..408f4f305fa242e370909c3f54ff8536973aedce 100644 --- a/swagger/api-authentication.yaml +++ b/swagger/api-authentication.yaml @@ -782,6 +782,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -853,15 +854,19 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound UserForgotDto: type: object properties: username: type: string + example: jcarberry email: type: string + example: jcarberry@brown.edu ContainerDto: required: - created @@ -876,17 +881,20 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality state: type: string + example: running enum: - - ContainerStateDto.CREATED - - ContainerStateDto.RESTARTING - - ContainerStateDto.RUNNING - - ContainerStateDto.PAUSED - - ContainerStateDto.EXITED - - ContainerStateDto.DEAD + - created + - restarting + - running + - paused + - exited + - dead databases: type: array items: @@ -899,38 +907,41 @@ components: created: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z internal_name: type: string + example: air-quality ip_address: type: string DatabaseDto: required: - - database creator - - database description - - database exchange - - database id - - database internal name - - database name + - creator + - exchange + - id + - internal_name + - name type: object properties: - database id: + id: type: integer format: int64 - example: 1 - database name: + name: type: string - example: Weather Australia - database exchange: + example: Air Quality + exchange: type: string - database creator: + example: air_quality + creator: $ref: '#/components/schemas/UserBriefDto' - database subjects: + subjects: type: array + description: database subjects items: type: string - database language: + description: database subjects + language: type: string - example: EN + example: en enum: - ab - aa @@ -1116,49 +1127,58 @@ components: - yo - za - zu - database license: + license: $ref: '#/components/schemas/LicenseDto' - database description: + description: type: string - example: Weather Australia 2009-2021 - database publisher: + example: Air Quality in Austria + publisher: type: string example: TU Wien - database contact person: + contact: $ref: '#/components/schemas/UserDto' tables: type: array items: $ref: '#/components/schemas/TableBriefDto' - database container image: + image: $ref: '#/components/schemas/ImageDto' container: $ref: '#/components/schemas/ContainerDto' - database creation time: + created: type: string format: date-time deleted: type: string format: date-time - database internal name: + internal_name: type: string - example: weather_australia - database publication year: + example: air_quality + publication_year: type: integer + description: database publication year format: int32 - database publication month: + example: 2022 + publication_month: type: integer + description: database publication month format: int32 - database publication day: + example: 12 + publication_day: type: integer + description: database publication day format: int32 - database public: + example: 15 + is_public: type: boolean + description: database publicity + example: true GrantedAuthorityDto: type: object properties: authority: type: string + example: ROLE_RESEARCHER ImageBriefDto: required: - id @@ -1171,8 +1191,10 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" ImageDateDto: required: - database_format @@ -1187,12 +1209,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -1213,36 +1239,46 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" dialect: type: string + example: org.hibernate.dialect.MariaDBDialect hash: type: string + example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e compiled: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z size: type: integer + example: 314295447 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' driver_class: type: string + example: org.mariadb.jdbc.Driver date_formats: type: array items: $ref: '#/components/schemas/ImageDateDto' jdbc_method: type: string + example: mariadb default_port: type: integer format: int32 + example: 3306 ImageEnvItemDto: required: - iid - key + - type - value type: object properties: @@ -1251,15 +1287,18 @@ components: format: int64 key: type: string + example: MARIADB_ROOT_PASSWORD value: type: string + example: mariadb type: type: string + example: PRIVILEGED_PASSWORD enum: - - USERNAME - - PASSWORD - - PRIVILEGED_USERNAME - - PRIVILEGED_PASSWORD + - username + - password + - privileged_username + - privileged_password LicenseDto: required: - identifier @@ -1268,9 +1307,10 @@ components: properties: identifier: type: string + example: MIT uri: type: string - example: MIT2 + example: https://opensource.org/licenses/MIT TableBriefDto: required: - creator @@ -1284,10 +1324,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserBriefDto: required: - email_verified @@ -1301,22 +1343,31 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true UserDto: required: - email @@ -1335,14 +1386,20 @@ components: $ref: '#/components/schemas/GrantedAuthorityDto' username: type: string + description: Only contains lowercase characters + example: jcarberry firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 containers: type: array items: @@ -1357,30 +1414,36 @@ components: $ref: '#/components/schemas/ContainerDto' email: type: string + example: jcarberry@brown.edu titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true UserUpdateDto: - required: - - firstname - - lastname type: object properties: firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string UserThemeSetDto: @@ -1390,6 +1453,7 @@ components: properties: theme_dark: type: boolean + example: true UserRolesDto: required: - roles @@ -1413,6 +1477,7 @@ components: properties: email: type: string + example: jcarberry@brown.edu UserResetDto: required: - password @@ -1433,8 +1498,10 @@ components: username: pattern: "^[a-z0-9]{3,}$" type: string + example: user email: type: string + example: user@example.com password: type: string LoginRequestDto: @@ -1445,6 +1512,7 @@ components: properties: username: type: string + example: user password: type: string JwtResponseDto: @@ -1461,8 +1529,10 @@ components: format: int64 username: type: string + example: user email: type: string + example: user@example.com roles: type: array items: diff --git a/swagger/api-authentication/swagger_client/models/container_dto.py b/swagger/api-authentication/swagger_client/models/container_dto.py index 30ead8278f5a12958bd17dcac9f08d4527cd9d84..2ee63baa6c5eb205fd79c108439fdf048c487371 100644 --- a/swagger/api-authentication/swagger_client/models/container_dto.py +++ b/swagger/api-authentication/swagger_client/models/container_dto.py @@ -169,7 +169,7 @@ class ContainerDto(object): :param state: The state of this ContainerDto. # noqa: E501 :type: str """ - allowed_values = ["ContainerStateDto.CREATED", "ContainerStateDto.RESTARTING", "ContainerStateDto.RUNNING", "ContainerStateDto.PAUSED", "ContainerStateDto.EXITED", "ContainerStateDto.DEAD"] # noqa: E501 + allowed_values = ["created", "restarting", "running", "paused", "exited", "dead"] # noqa: E501 if state not in allowed_values: raise ValueError( "Invalid value for `state` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-authentication/swagger_client/models/database_dto.py b/swagger/api-authentication/swagger_client/models/database_dto.py index 6119a4d801d552d4994ae04eae81b457e5c98622..a9a30f5c7c80da0d264b90f5173837c43ce00e77 100644 --- a/swagger/api-authentication/swagger_client/models/database_dto.py +++ b/swagger/api-authentication/swagger_client/models/database_dto.py @@ -28,334 +28,335 @@ class DatabaseDto(object): and the value is json key in definition. """ swagger_types = { - 'database_id': 'int', - 'database_name': 'str', - 'database_exchange': 'str', - 'database_creator': 'UserBriefDto', - 'database_subjects': 'list[str]', - 'database_language': 'str', - 'database_license': 'LicenseDto', - 'database_description': 'str', - 'database_publisher': 'str', - 'database_contact_person': 'UserDto', + 'id': 'int', + 'name': 'str', + 'exchange': 'str', + 'creator': 'UserBriefDto', + 'subjects': 'list[str]', + 'language': 'str', + 'license': 'LicenseDto', + 'description': 'str', + 'publisher': 'str', + 'contact': 'UserDto', 'tables': 'list[TableBriefDto]', - 'database_container_image': 'ImageDto', + 'image': 'ImageDto', 'container': 'ContainerDto', - 'database_creation_time': 'datetime', + 'created': 'datetime', 'deleted': 'datetime', - 'database_internal_name': 'str', - 'database_publication_year': 'int', - 'database_publication_month': 'int', - 'database_publication_day': 'int', - 'database_public': 'bool' + 'internal_name': 'str', + 'publication_year': 'int', + 'publication_month': 'int', + 'publication_day': 'int', + 'is_public': 'bool' } attribute_map = { - 'database_id': 'database id', - 'database_name': 'database name', - 'database_exchange': 'database exchange', - 'database_creator': 'database creator', - 'database_subjects': 'database subjects', - 'database_language': 'database language', - 'database_license': 'database license', - 'database_description': 'database description', - 'database_publisher': 'database publisher', - 'database_contact_person': 'database contact person', + 'id': 'id', + 'name': 'name', + 'exchange': 'exchange', + 'creator': 'creator', + 'subjects': 'subjects', + 'language': 'language', + 'license': 'license', + 'description': 'description', + 'publisher': 'publisher', + 'contact': 'contact', 'tables': 'tables', - 'database_container_image': 'database container image', + 'image': 'image', 'container': 'container', - 'database_creation_time': 'database creation time', + 'created': 'created', 'deleted': 'deleted', - 'database_internal_name': 'database internal name', - 'database_publication_year': 'database publication year', - 'database_publication_month': 'database publication month', - 'database_publication_day': 'database publication day', - 'database_public': 'database public' + 'internal_name': 'internal_name', + 'publication_year': 'publication_year', + 'publication_month': 'publication_month', + 'publication_day': 'publication_day', + 'is_public': 'is_public' } - def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None): # noqa: E501 + def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None): # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501 - self._database_id = None - self._database_name = None - self._database_exchange = None - self._database_creator = None - self._database_subjects = None - self._database_language = None - self._database_license = None - self._database_description = None - self._database_publisher = None - self._database_contact_person = None + self._id = None + self._name = None + self._exchange = None + self._creator = None + self._subjects = None + self._language = None + self._license = None + self._description = None + self._publisher = None + self._contact = None self._tables = None - self._database_container_image = None + self._image = None self._container = None - self._database_creation_time = None + self._created = None self._deleted = None - self._database_internal_name = None - self._database_publication_year = None - self._database_publication_month = None - self._database_publication_day = None - self._database_public = None + self._internal_name = None + self._publication_year = None + self._publication_month = None + self._publication_day = None + self._is_public = None self.discriminator = None - self.database_id = database_id - self.database_name = database_name - self.database_exchange = database_exchange - self.database_creator = database_creator - if database_subjects is not None: - self.database_subjects = database_subjects - if database_language is not None: - self.database_language = database_language - if database_license is not None: - self.database_license = database_license - self.database_description = database_description - if database_publisher is not None: - self.database_publisher = database_publisher - if database_contact_person is not None: - self.database_contact_person = database_contact_person + self.id = id + self.name = name + self.exchange = exchange + self.creator = creator + if subjects is not None: + self.subjects = subjects + if language is not None: + self.language = language + if license is not None: + self.license = license + if description is not None: + self.description = description + if publisher is not None: + self.publisher = publisher + if contact is not None: + self.contact = contact if tables is not None: self.tables = tables - if database_container_image is not None: - self.database_container_image = database_container_image + if image is not None: + self.image = image if container is not None: self.container = container - if database_creation_time is not None: - self.database_creation_time = database_creation_time + if created is not None: + self.created = created if deleted is not None: self.deleted = deleted - self.database_internal_name = database_internal_name - if database_publication_year is not None: - self.database_publication_year = database_publication_year - if database_publication_month is not None: - self.database_publication_month = database_publication_month - if database_publication_day is not None: - self.database_publication_day = database_publication_day - if database_public is not None: - self.database_public = database_public + self.internal_name = internal_name + if publication_year is not None: + self.publication_year = publication_year + if publication_month is not None: + self.publication_month = publication_month + if publication_day is not None: + self.publication_day = publication_day + if is_public is not None: + self.is_public = is_public @property - def database_id(self): - """Gets the database_id of this DatabaseDto. # noqa: E501 + def id(self): + """Gets the id of this DatabaseDto. # noqa: E501 - :return: The database_id of this DatabaseDto. # noqa: E501 + :return: The id of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_id + return self._id - @database_id.setter - def database_id(self, database_id): - """Sets the database_id of this DatabaseDto. + @id.setter + def id(self, id): + """Sets the id of this DatabaseDto. - :param database_id: The database_id of this DatabaseDto. # noqa: E501 + :param id: The id of this DatabaseDto. # noqa: E501 :type: int """ - if database_id is None: - raise ValueError("Invalid value for `database_id`, must not be `None`") # noqa: E501 + if id is None: + raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501 - self._database_id = database_id + self._id = id @property - def database_name(self): - """Gets the database_name of this DatabaseDto. # noqa: E501 + def name(self): + """Gets the name of this DatabaseDto. # noqa: E501 - :return: The database_name of this DatabaseDto. # noqa: E501 + :return: The name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_name + return self._name - @database_name.setter - def database_name(self, database_name): - """Sets the database_name of this DatabaseDto. + @name.setter + def name(self, name): + """Sets the name of this DatabaseDto. - :param database_name: The database_name of this DatabaseDto. # noqa: E501 + :param name: The name of this DatabaseDto. # noqa: E501 :type: str """ - if database_name is None: - raise ValueError("Invalid value for `database_name`, must not be `None`") # noqa: E501 + if name is None: + raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 - self._database_name = database_name + self._name = name @property - def database_exchange(self): - """Gets the database_exchange of this DatabaseDto. # noqa: E501 + def exchange(self): + """Gets the exchange of this DatabaseDto. # noqa: E501 - :return: The database_exchange of this DatabaseDto. # noqa: E501 + :return: The exchange of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_exchange + return self._exchange - @database_exchange.setter - def database_exchange(self, database_exchange): - """Sets the database_exchange of this DatabaseDto. + @exchange.setter + def exchange(self, exchange): + """Sets the exchange of this DatabaseDto. - :param database_exchange: The database_exchange of this DatabaseDto. # noqa: E501 + :param exchange: The exchange of this DatabaseDto. # noqa: E501 :type: str """ - if database_exchange is None: - raise ValueError("Invalid value for `database_exchange`, must not be `None`") # noqa: E501 + if exchange is None: + raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501 - self._database_exchange = database_exchange + self._exchange = exchange @property - def database_creator(self): - """Gets the database_creator of this DatabaseDto. # noqa: E501 + def creator(self): + """Gets the creator of this DatabaseDto. # noqa: E501 - :return: The database_creator of this DatabaseDto. # noqa: E501 + :return: The creator of this DatabaseDto. # noqa: E501 :rtype: UserBriefDto """ - return self._database_creator + return self._creator - @database_creator.setter - def database_creator(self, database_creator): - """Sets the database_creator of this DatabaseDto. + @creator.setter + def creator(self, creator): + """Sets the creator of this DatabaseDto. - :param database_creator: The database_creator of this DatabaseDto. # noqa: E501 + :param creator: The creator of this DatabaseDto. # noqa: E501 :type: UserBriefDto """ - if database_creator is None: - raise ValueError("Invalid value for `database_creator`, must not be `None`") # noqa: E501 + if creator is None: + raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 - self._database_creator = database_creator + self._creator = creator @property - def database_subjects(self): - """Gets the database_subjects of this DatabaseDto. # noqa: E501 + def subjects(self): + """Gets the subjects of this DatabaseDto. # noqa: E501 + database subjects # noqa: E501 - :return: The database_subjects of this DatabaseDto. # noqa: E501 + :return: The subjects of this DatabaseDto. # noqa: E501 :rtype: list[str] """ - return self._database_subjects + return self._subjects - @database_subjects.setter - def database_subjects(self, database_subjects): - """Sets the database_subjects of this DatabaseDto. + @subjects.setter + def subjects(self, subjects): + """Sets the subjects of this DatabaseDto. + database subjects # noqa: E501 - :param database_subjects: The database_subjects of this DatabaseDto. # noqa: E501 + :param subjects: The subjects of this DatabaseDto. # noqa: E501 :type: list[str] """ - self._database_subjects = database_subjects + self._subjects = subjects @property - def database_language(self): - """Gets the database_language of this DatabaseDto. # noqa: E501 + def language(self): + """Gets the language of this DatabaseDto. # noqa: E501 - :return: The database_language of this DatabaseDto. # noqa: E501 + :return: The language of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_language + return self._language - @database_language.setter - def database_language(self, database_language): - """Sets the database_language of this DatabaseDto. + @language.setter + def language(self, language): + """Sets the language of this DatabaseDto. - :param database_language: The database_language of this DatabaseDto. # noqa: E501 + :param language: The language of this DatabaseDto. # noqa: E501 :type: str """ allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"] # noqa: E501 - if database_language not in allowed_values: + if language not in allowed_values: raise ValueError( - "Invalid value for `database_language` ({0}), must be one of {1}" # noqa: E501 - .format(database_language, allowed_values) + "Invalid value for `language` ({0}), must be one of {1}" # noqa: E501 + .format(language, allowed_values) ) - self._database_language = database_language + self._language = language @property - def database_license(self): - """Gets the database_license of this DatabaseDto. # noqa: E501 + def license(self): + """Gets the license of this DatabaseDto. # noqa: E501 - :return: The database_license of this DatabaseDto. # noqa: E501 + :return: The license of this DatabaseDto. # noqa: E501 :rtype: LicenseDto """ - return self._database_license + return self._license - @database_license.setter - def database_license(self, database_license): - """Sets the database_license of this DatabaseDto. + @license.setter + def license(self, license): + """Sets the license of this DatabaseDto. - :param database_license: The database_license of this DatabaseDto. # noqa: E501 + :param license: The license of this DatabaseDto. # noqa: E501 :type: LicenseDto """ - self._database_license = database_license + self._license = license @property - def database_description(self): - """Gets the database_description of this DatabaseDto. # noqa: E501 + def description(self): + """Gets the description of this DatabaseDto. # noqa: E501 - :return: The database_description of this DatabaseDto. # noqa: E501 + :return: The description of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_description + return self._description - @database_description.setter - def database_description(self, database_description): - """Sets the database_description of this DatabaseDto. + @description.setter + def description(self, description): + """Sets the description of this DatabaseDto. - :param database_description: The database_description of this DatabaseDto. # noqa: E501 + :param description: The description of this DatabaseDto. # noqa: E501 :type: str """ - if database_description is None: - raise ValueError("Invalid value for `database_description`, must not be `None`") # noqa: E501 - self._database_description = database_description + self._description = description @property - def database_publisher(self): - """Gets the database_publisher of this DatabaseDto. # noqa: E501 + def publisher(self): + """Gets the publisher of this DatabaseDto. # noqa: E501 - :return: The database_publisher of this DatabaseDto. # noqa: E501 + :return: The publisher of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_publisher + return self._publisher - @database_publisher.setter - def database_publisher(self, database_publisher): - """Sets the database_publisher of this DatabaseDto. + @publisher.setter + def publisher(self, publisher): + """Sets the publisher of this DatabaseDto. - :param database_publisher: The database_publisher of this DatabaseDto. # noqa: E501 + :param publisher: The publisher of this DatabaseDto. # noqa: E501 :type: str """ - self._database_publisher = database_publisher + self._publisher = publisher @property - def database_contact_person(self): - """Gets the database_contact_person of this DatabaseDto. # noqa: E501 + def contact(self): + """Gets the contact of this DatabaseDto. # noqa: E501 - :return: The database_contact_person of this DatabaseDto. # noqa: E501 + :return: The contact of this DatabaseDto. # noqa: E501 :rtype: UserDto """ - return self._database_contact_person + return self._contact - @database_contact_person.setter - def database_contact_person(self, database_contact_person): - """Sets the database_contact_person of this DatabaseDto. + @contact.setter + def contact(self, contact): + """Sets the contact of this DatabaseDto. - :param database_contact_person: The database_contact_person of this DatabaseDto. # noqa: E501 + :param contact: The contact of this DatabaseDto. # noqa: E501 :type: UserDto """ - self._database_contact_person = database_contact_person + self._contact = contact @property def tables(self): @@ -379,25 +380,25 @@ class DatabaseDto(object): self._tables = tables @property - def database_container_image(self): - """Gets the database_container_image of this DatabaseDto. # noqa: E501 + def image(self): + """Gets the image of this DatabaseDto. # noqa: E501 - :return: The database_container_image of this DatabaseDto. # noqa: E501 + :return: The image of this DatabaseDto. # noqa: E501 :rtype: ImageDto """ - return self._database_container_image + return self._image - @database_container_image.setter - def database_container_image(self, database_container_image): - """Sets the database_container_image of this DatabaseDto. + @image.setter + def image(self, image): + """Sets the image of this DatabaseDto. - :param database_container_image: The database_container_image of this DatabaseDto. # noqa: E501 + :param image: The image of this DatabaseDto. # noqa: E501 :type: ImageDto """ - self._database_container_image = database_container_image + self._image = image @property def container(self): @@ -421,25 +422,25 @@ class DatabaseDto(object): self._container = container @property - def database_creation_time(self): - """Gets the database_creation_time of this DatabaseDto. # noqa: E501 + def created(self): + """Gets the created of this DatabaseDto. # noqa: E501 - :return: The database_creation_time of this DatabaseDto. # noqa: E501 + :return: The created of this DatabaseDto. # noqa: E501 :rtype: datetime """ - return self._database_creation_time + return self._created - @database_creation_time.setter - def database_creation_time(self, database_creation_time): - """Sets the database_creation_time of this DatabaseDto. + @created.setter + def created(self, created): + """Sets the created of this DatabaseDto. - :param database_creation_time: The database_creation_time of this DatabaseDto. # noqa: E501 + :param created: The created of this DatabaseDto. # noqa: E501 :type: datetime """ - self._database_creation_time = database_creation_time + self._created = created @property def deleted(self): @@ -463,111 +464,119 @@ class DatabaseDto(object): self._deleted = deleted @property - def database_internal_name(self): - """Gets the database_internal_name of this DatabaseDto. # noqa: E501 + def internal_name(self): + """Gets the internal_name of this DatabaseDto. # noqa: E501 - :return: The database_internal_name of this DatabaseDto. # noqa: E501 + :return: The internal_name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_internal_name + return self._internal_name - @database_internal_name.setter - def database_internal_name(self, database_internal_name): - """Sets the database_internal_name of this DatabaseDto. + @internal_name.setter + def internal_name(self, internal_name): + """Sets the internal_name of this DatabaseDto. - :param database_internal_name: The database_internal_name of this DatabaseDto. # noqa: E501 + :param internal_name: The internal_name of this DatabaseDto. # noqa: E501 :type: str """ - if database_internal_name is None: - raise ValueError("Invalid value for `database_internal_name`, must not be `None`") # noqa: E501 + if internal_name is None: + raise ValueError("Invalid value for `internal_name`, must not be `None`") # noqa: E501 - self._database_internal_name = database_internal_name + self._internal_name = internal_name @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseDto. # noqa: E501 + :return: The publication_year of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property - def database_publication_month(self): - """Gets the database_publication_month of this DatabaseDto. # noqa: E501 + def publication_month(self): + """Gets the publication_month of this DatabaseDto. # noqa: E501 + database publication month # noqa: E501 - :return: The database_publication_month of this DatabaseDto. # noqa: E501 + :return: The publication_month of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_month + return self._publication_month - @database_publication_month.setter - def database_publication_month(self, database_publication_month): - """Sets the database_publication_month of this DatabaseDto. + @publication_month.setter + def publication_month(self, publication_month): + """Sets the publication_month of this DatabaseDto. + database publication month # noqa: E501 - :param database_publication_month: The database_publication_month of this DatabaseDto. # noqa: E501 + :param publication_month: The publication_month of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_month = database_publication_month + self._publication_month = publication_month @property - def database_publication_day(self): - """Gets the database_publication_day of this DatabaseDto. # noqa: E501 + def publication_day(self): + """Gets the publication_day of this DatabaseDto. # noqa: E501 + database publication day # noqa: E501 - :return: The database_publication_day of this DatabaseDto. # noqa: E501 + :return: The publication_day of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_day + return self._publication_day - @database_publication_day.setter - def database_publication_day(self, database_publication_day): - """Sets the database_publication_day of this DatabaseDto. + @publication_day.setter + def publication_day(self, publication_day): + """Sets the publication_day of this DatabaseDto. + database publication day # noqa: E501 - :param database_publication_day: The database_publication_day of this DatabaseDto. # noqa: E501 + :param publication_day: The publication_day of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_day = database_publication_day + self._publication_day = publication_day @property - def database_public(self): - """Gets the database_public of this DatabaseDto. # noqa: E501 + def is_public(self): + """Gets the is_public of this DatabaseDto. # noqa: E501 + database publicity # noqa: E501 - :return: The database_public of this DatabaseDto. # noqa: E501 + :return: The is_public of this DatabaseDto. # noqa: E501 :rtype: bool """ - return self._database_public + return self._is_public - @database_public.setter - def database_public(self, database_public): - """Sets the database_public of this DatabaseDto. + @is_public.setter + def is_public(self, is_public): + """Sets the is_public of this DatabaseDto. + database publicity # noqa: E501 - :param database_public: The database_public of this DatabaseDto. # noqa: E501 + :param is_public: The is_public of this DatabaseDto. # noqa: E501 :type: bool """ - self._database_public = database_public + self._is_public = is_public def to_dict(self): """Returns the model properties as a dict""" diff --git a/swagger/api-authentication/swagger_client/models/image_env_item_dto.py b/swagger/api-authentication/swagger_client/models/image_env_item_dto.py index 30cae17883057e0e928cc721ade694a2bc7988af..0a8089775eddf76cf0fc461d9cc94852246487ff 100644 --- a/swagger/api-authentication/swagger_client/models/image_env_item_dto.py +++ b/swagger/api-authentication/swagger_client/models/image_env_item_dto.py @@ -51,8 +51,7 @@ class ImageEnvItemDto(object): self.iid = iid self.key = key self.value = value - if type is not None: - self.type = type + self.type = type @property def iid(self): @@ -141,7 +140,9 @@ class ImageEnvItemDto(object): :param type: The type of this ImageEnvItemDto. # noqa: E501 :type: str """ - allowed_values = ["USERNAME", "PASSWORD", "PRIVILEGED_USERNAME", "PRIVILEGED_PASSWORD"] # noqa: E501 + if type is None: + raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501 + allowed_values = ["username", "password", "privileged_username", "privileged_password"] # noqa: E501 if type not in allowed_values: raise ValueError( "Invalid value for `type` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-authentication/swagger_client/models/user_brief_dto.py b/swagger/api-authentication/swagger_client/models/user_brief_dto.py index 7b904d8e7a7eccc8d285001ca74db5346faa06e5..79fbd2db971a41b74fda65941dde1e04f6e81ebf 100644 --- a/swagger/api-authentication/swagger_client/models/user_brief_dto.py +++ b/swagger/api-authentication/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/api-authentication/swagger_client/models/user_dto.py b/swagger/api-authentication/swagger_client/models/user_dto.py index 88484dad5345dec904944dd18b6d637ada8e7bbb..e5a3cf440293c565718006cd46962706ad260f6f 100644 --- a/swagger/api-authentication/swagger_client/models/user_dto.py +++ b/swagger/api-authentication/swagger_client/models/user_dto.py @@ -155,6 +155,7 @@ class UserDto(object): def username(self): """Gets the username of this UserDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserDto. # noqa: E501 :rtype: str @@ -165,6 +166,7 @@ class UserDto(object): def username(self, username): """Sets the username of this UserDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserDto. # noqa: E501 :type: str diff --git a/swagger/api-authentication/swagger_client/models/user_update_dto.py b/swagger/api-authentication/swagger_client/models/user_update_dto.py index 06ceb6b9acbac5ec04c2278d0636d3d4ecfaddb9..24d66d8517df6bcb925bf669f6e2976a563472c5 100644 --- a/swagger/api-authentication/swagger_client/models/user_update_dto.py +++ b/swagger/api-authentication/swagger_client/models/user_update_dto.py @@ -54,8 +54,10 @@ class UserUpdateDto(object): self._titles_before = None self._titles_after = None self.discriminator = None - self.firstname = firstname - self.lastname = lastname + if firstname is not None: + self.firstname = firstname + if lastname is not None: + self.lastname = lastname if affiliation is not None: self.affiliation = affiliation if orcid is not None: @@ -83,8 +85,6 @@ class UserUpdateDto(object): :param firstname: The firstname of this UserUpdateDto. # noqa: E501 :type: str """ - if firstname is None: - raise ValueError("Invalid value for `firstname`, must not be `None`") # noqa: E501 self._firstname = firstname @@ -106,8 +106,6 @@ class UserUpdateDto(object): :param lastname: The lastname of this UserUpdateDto. # noqa: E501 :type: str """ - if lastname is None: - raise ValueError("Invalid value for `lastname`, must not be `None`") # noqa: E501 self._lastname = lastname diff --git a/swagger/api-container.yaml b/swagger/api-container.yaml index 3aa091c70c39f20f3e5416645d91bf6049c8186c..47b6cff1ac42b9260880866067ef0f4f8bf8ceed 100644 --- a/swagger/api-container.yaml +++ b/swagger/api-container.yaml @@ -533,6 +533,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -604,14 +605,15 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound ImageChangeDto: required: - dialect - driver_class - jdbc_method - - logo type: object properties: defaultPort: @@ -619,22 +621,25 @@ components: minimum: 1024 type: integer format: int32 + example: 5432 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' - logo: - type: string dialect: type: string + example: Postgres driver_class: type: string + example: org.postgresql.Driver jdbc_method: type: string + example: postgresql ImageEnvItemDto: required: - iid - key + - type - value type: object properties: @@ -643,15 +648,18 @@ components: format: int64 key: type: string + example: MARIADB_ROOT_PASSWORD value: type: string + example: mariadb type: type: string + example: PRIVILEGED_PASSWORD enum: - - USERNAME - - PASSWORD - - PRIVILEGED_USERNAME - - PRIVILEGED_PASSWORD + - username + - password + - privileged_username + - privileged_password ImageDateDto: required: - database_format @@ -666,12 +674,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -692,32 +704,41 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" dialect: type: string + example: org.hibernate.dialect.MariaDBDialect hash: type: string + example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e compiled: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z size: type: integer + example: 314295447 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' driver_class: type: string + example: org.mariadb.jdbc.Driver date_formats: type: array items: $ref: '#/components/schemas/ImageDateDto' jdbc_method: type: string + example: mariadb default_port: type: integer format: int32 + example: 3306 ContainerChangeDto: required: - action @@ -741,8 +762,10 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' created: @@ -750,6 +773,7 @@ components: format: date-time internal_name: type: string + example: air-quality UserBriefDto: required: - email_verified @@ -763,44 +787,48 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true ImageCreateDto: required: - default_port - dialect - driver_class - jdbc_method - - local - - logo - repository - tag type: object properties: repository: type: string + example: mariadb tag: type: string dialect: type: string - logo: - type: string - local: - type: boolean environment: type: array items: @@ -821,10 +849,13 @@ components: properties: name: type: string + example: Air Quality repository: type: string + example: mariadb tag: type: string + example: "10.5" ImageBriefDto: required: - id @@ -837,8 +868,10 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" ContainerDto: required: - created @@ -853,17 +886,20 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality state: type: string + example: running enum: - - ContainerStateDto.CREATED - - ContainerStateDto.RESTARTING - - ContainerStateDto.RUNNING - - ContainerStateDto.PAUSED - - ContainerStateDto.EXITED - - ContainerStateDto.DEAD + - created + - restarting + - running + - paused + - exited + - dead databases: type: array items: @@ -876,38 +912,41 @@ components: created: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z internal_name: type: string + example: air-quality ip_address: type: string DatabaseDto: required: - - database creator - - database description - - database exchange - - database id - - database internal name - - database name + - creator + - exchange + - id + - internal_name + - name type: object properties: - database id: + id: type: integer format: int64 - example: 1 - database name: + name: type: string - example: Weather Australia - database exchange: + example: Air Quality + exchange: type: string - database creator: + example: air_quality + creator: $ref: '#/components/schemas/UserBriefDto' - database subjects: + subjects: type: array + description: database subjects items: type: string - database language: + description: database subjects + language: type: string - example: EN + example: en enum: - ab - aa @@ -1093,49 +1132,58 @@ components: - yo - za - zu - database license: + license: $ref: '#/components/schemas/LicenseDto' - database description: + description: type: string - example: Weather Australia 2009-2021 - database publisher: + example: Air Quality in Austria + publisher: type: string example: TU Wien - database contact person: + contact: $ref: '#/components/schemas/UserDto' tables: type: array items: $ref: '#/components/schemas/TableBriefDto' - database container image: + image: $ref: '#/components/schemas/ImageDto' container: $ref: '#/components/schemas/ContainerDto' - database creation time: + created: type: string format: date-time deleted: type: string format: date-time - database internal name: + internal_name: type: string - example: weather_australia - database publication year: + example: air_quality + publication_year: type: integer + description: database publication year format: int32 - database publication month: + example: 2022 + publication_month: type: integer + description: database publication month format: int32 - database publication day: + example: 12 + publication_day: type: integer + description: database publication day format: int32 - database public: + example: 15 + is_public: type: boolean + description: database publicity + example: true GrantedAuthorityDto: type: object properties: authority: type: string + example: ROLE_RESEARCHER LicenseDto: required: - identifier @@ -1144,9 +1192,10 @@ components: properties: identifier: type: string + example: MIT uri: type: string - example: MIT2 + example: https://opensource.org/licenses/MIT TableBriefDto: required: - creator @@ -1160,10 +1209,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserDto: required: - email @@ -1182,14 +1233,20 @@ components: $ref: '#/components/schemas/GrantedAuthorityDto' username: type: string + description: Only contains lowercase characters + example: jcarberry firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 containers: type: array items: @@ -1204,14 +1261,18 @@ components: $ref: '#/components/schemas/ContainerDto' email: type: string + example: jcarberry@brown.edu titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true securitySchemes: bearerAuth: type: http diff --git a/swagger/api-container/swagger_client/models/container_dto.py b/swagger/api-container/swagger_client/models/container_dto.py index d5acb90cf9a5ab1b1d1da37f64b71832da32627d..0be42d21d1d2692b65afe99388fb1eccd24a93cf 100644 --- a/swagger/api-container/swagger_client/models/container_dto.py +++ b/swagger/api-container/swagger_client/models/container_dto.py @@ -169,7 +169,7 @@ class ContainerDto(object): :param state: The state of this ContainerDto. # noqa: E501 :type: str """ - allowed_values = ["ContainerStateDto.CREATED", "ContainerStateDto.RESTARTING", "ContainerStateDto.RUNNING", "ContainerStateDto.PAUSED", "ContainerStateDto.EXITED", "ContainerStateDto.DEAD"] # noqa: E501 + allowed_values = ["created", "restarting", "running", "paused", "exited", "dead"] # noqa: E501 if state not in allowed_values: raise ValueError( "Invalid value for `state` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-container/swagger_client/models/database_dto.py b/swagger/api-container/swagger_client/models/database_dto.py index 95e967060fc4db7b769e9d3d3ebf7b6d63e22997..5c0b35a3277cdcb2153446d382383c078807e205 100644 --- a/swagger/api-container/swagger_client/models/database_dto.py +++ b/swagger/api-container/swagger_client/models/database_dto.py @@ -28,334 +28,335 @@ class DatabaseDto(object): and the value is json key in definition. """ swagger_types = { - 'database_id': 'int', - 'database_name': 'str', - 'database_exchange': 'str', - 'database_creator': 'UserBriefDto', - 'database_subjects': 'list[str]', - 'database_language': 'str', - 'database_license': 'LicenseDto', - 'database_description': 'str', - 'database_publisher': 'str', - 'database_contact_person': 'UserDto', + 'id': 'int', + 'name': 'str', + 'exchange': 'str', + 'creator': 'UserBriefDto', + 'subjects': 'list[str]', + 'language': 'str', + 'license': 'LicenseDto', + 'description': 'str', + 'publisher': 'str', + 'contact': 'UserDto', 'tables': 'list[TableBriefDto]', - 'database_container_image': 'ImageDto', + 'image': 'ImageDto', 'container': 'ContainerDto', - 'database_creation_time': 'datetime', + 'created': 'datetime', 'deleted': 'datetime', - 'database_internal_name': 'str', - 'database_publication_year': 'int', - 'database_publication_month': 'int', - 'database_publication_day': 'int', - 'database_public': 'bool' + 'internal_name': 'str', + 'publication_year': 'int', + 'publication_month': 'int', + 'publication_day': 'int', + 'is_public': 'bool' } attribute_map = { - 'database_id': 'database id', - 'database_name': 'database name', - 'database_exchange': 'database exchange', - 'database_creator': 'database creator', - 'database_subjects': 'database subjects', - 'database_language': 'database language', - 'database_license': 'database license', - 'database_description': 'database description', - 'database_publisher': 'database publisher', - 'database_contact_person': 'database contact person', + 'id': 'id', + 'name': 'name', + 'exchange': 'exchange', + 'creator': 'creator', + 'subjects': 'subjects', + 'language': 'language', + 'license': 'license', + 'description': 'description', + 'publisher': 'publisher', + 'contact': 'contact', 'tables': 'tables', - 'database_container_image': 'database container image', + 'image': 'image', 'container': 'container', - 'database_creation_time': 'database creation time', + 'created': 'created', 'deleted': 'deleted', - 'database_internal_name': 'database internal name', - 'database_publication_year': 'database publication year', - 'database_publication_month': 'database publication month', - 'database_publication_day': 'database publication day', - 'database_public': 'database public' + 'internal_name': 'internal_name', + 'publication_year': 'publication_year', + 'publication_month': 'publication_month', + 'publication_day': 'publication_day', + 'is_public': 'is_public' } - def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None): # noqa: E501 + def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None): # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501 - self._database_id = None - self._database_name = None - self._database_exchange = None - self._database_creator = None - self._database_subjects = None - self._database_language = None - self._database_license = None - self._database_description = None - self._database_publisher = None - self._database_contact_person = None + self._id = None + self._name = None + self._exchange = None + self._creator = None + self._subjects = None + self._language = None + self._license = None + self._description = None + self._publisher = None + self._contact = None self._tables = None - self._database_container_image = None + self._image = None self._container = None - self._database_creation_time = None + self._created = None self._deleted = None - self._database_internal_name = None - self._database_publication_year = None - self._database_publication_month = None - self._database_publication_day = None - self._database_public = None + self._internal_name = None + self._publication_year = None + self._publication_month = None + self._publication_day = None + self._is_public = None self.discriminator = None - self.database_id = database_id - self.database_name = database_name - self.database_exchange = database_exchange - self.database_creator = database_creator - if database_subjects is not None: - self.database_subjects = database_subjects - if database_language is not None: - self.database_language = database_language - if database_license is not None: - self.database_license = database_license - self.database_description = database_description - if database_publisher is not None: - self.database_publisher = database_publisher - if database_contact_person is not None: - self.database_contact_person = database_contact_person + self.id = id + self.name = name + self.exchange = exchange + self.creator = creator + if subjects is not None: + self.subjects = subjects + if language is not None: + self.language = language + if license is not None: + self.license = license + if description is not None: + self.description = description + if publisher is not None: + self.publisher = publisher + if contact is not None: + self.contact = contact if tables is not None: self.tables = tables - if database_container_image is not None: - self.database_container_image = database_container_image + if image is not None: + self.image = image if container is not None: self.container = container - if database_creation_time is not None: - self.database_creation_time = database_creation_time + if created is not None: + self.created = created if deleted is not None: self.deleted = deleted - self.database_internal_name = database_internal_name - if database_publication_year is not None: - self.database_publication_year = database_publication_year - if database_publication_month is not None: - self.database_publication_month = database_publication_month - if database_publication_day is not None: - self.database_publication_day = database_publication_day - if database_public is not None: - self.database_public = database_public + self.internal_name = internal_name + if publication_year is not None: + self.publication_year = publication_year + if publication_month is not None: + self.publication_month = publication_month + if publication_day is not None: + self.publication_day = publication_day + if is_public is not None: + self.is_public = is_public @property - def database_id(self): - """Gets the database_id of this DatabaseDto. # noqa: E501 + def id(self): + """Gets the id of this DatabaseDto. # noqa: E501 - :return: The database_id of this DatabaseDto. # noqa: E501 + :return: The id of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_id + return self._id - @database_id.setter - def database_id(self, database_id): - """Sets the database_id of this DatabaseDto. + @id.setter + def id(self, id): + """Sets the id of this DatabaseDto. - :param database_id: The database_id of this DatabaseDto. # noqa: E501 + :param id: The id of this DatabaseDto. # noqa: E501 :type: int """ - if database_id is None: - raise ValueError("Invalid value for `database_id`, must not be `None`") # noqa: E501 + if id is None: + raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501 - self._database_id = database_id + self._id = id @property - def database_name(self): - """Gets the database_name of this DatabaseDto. # noqa: E501 + def name(self): + """Gets the name of this DatabaseDto. # noqa: E501 - :return: The database_name of this DatabaseDto. # noqa: E501 + :return: The name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_name + return self._name - @database_name.setter - def database_name(self, database_name): - """Sets the database_name of this DatabaseDto. + @name.setter + def name(self, name): + """Sets the name of this DatabaseDto. - :param database_name: The database_name of this DatabaseDto. # noqa: E501 + :param name: The name of this DatabaseDto. # noqa: E501 :type: str """ - if database_name is None: - raise ValueError("Invalid value for `database_name`, must not be `None`") # noqa: E501 + if name is None: + raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 - self._database_name = database_name + self._name = name @property - def database_exchange(self): - """Gets the database_exchange of this DatabaseDto. # noqa: E501 + def exchange(self): + """Gets the exchange of this DatabaseDto. # noqa: E501 - :return: The database_exchange of this DatabaseDto. # noqa: E501 + :return: The exchange of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_exchange + return self._exchange - @database_exchange.setter - def database_exchange(self, database_exchange): - """Sets the database_exchange of this DatabaseDto. + @exchange.setter + def exchange(self, exchange): + """Sets the exchange of this DatabaseDto. - :param database_exchange: The database_exchange of this DatabaseDto. # noqa: E501 + :param exchange: The exchange of this DatabaseDto. # noqa: E501 :type: str """ - if database_exchange is None: - raise ValueError("Invalid value for `database_exchange`, must not be `None`") # noqa: E501 + if exchange is None: + raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501 - self._database_exchange = database_exchange + self._exchange = exchange @property - def database_creator(self): - """Gets the database_creator of this DatabaseDto. # noqa: E501 + def creator(self): + """Gets the creator of this DatabaseDto. # noqa: E501 - :return: The database_creator of this DatabaseDto. # noqa: E501 + :return: The creator of this DatabaseDto. # noqa: E501 :rtype: UserBriefDto """ - return self._database_creator + return self._creator - @database_creator.setter - def database_creator(self, database_creator): - """Sets the database_creator of this DatabaseDto. + @creator.setter + def creator(self, creator): + """Sets the creator of this DatabaseDto. - :param database_creator: The database_creator of this DatabaseDto. # noqa: E501 + :param creator: The creator of this DatabaseDto. # noqa: E501 :type: UserBriefDto """ - if database_creator is None: - raise ValueError("Invalid value for `database_creator`, must not be `None`") # noqa: E501 + if creator is None: + raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 - self._database_creator = database_creator + self._creator = creator @property - def database_subjects(self): - """Gets the database_subjects of this DatabaseDto. # noqa: E501 + def subjects(self): + """Gets the subjects of this DatabaseDto. # noqa: E501 + database subjects # noqa: E501 - :return: The database_subjects of this DatabaseDto. # noqa: E501 + :return: The subjects of this DatabaseDto. # noqa: E501 :rtype: list[str] """ - return self._database_subjects + return self._subjects - @database_subjects.setter - def database_subjects(self, database_subjects): - """Sets the database_subjects of this DatabaseDto. + @subjects.setter + def subjects(self, subjects): + """Sets the subjects of this DatabaseDto. + database subjects # noqa: E501 - :param database_subjects: The database_subjects of this DatabaseDto. # noqa: E501 + :param subjects: The subjects of this DatabaseDto. # noqa: E501 :type: list[str] """ - self._database_subjects = database_subjects + self._subjects = subjects @property - def database_language(self): - """Gets the database_language of this DatabaseDto. # noqa: E501 + def language(self): + """Gets the language of this DatabaseDto. # noqa: E501 - :return: The database_language of this DatabaseDto. # noqa: E501 + :return: The language of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_language + return self._language - @database_language.setter - def database_language(self, database_language): - """Sets the database_language of this DatabaseDto. + @language.setter + def language(self, language): + """Sets the language of this DatabaseDto. - :param database_language: The database_language of this DatabaseDto. # noqa: E501 + :param language: The language of this DatabaseDto. # noqa: E501 :type: str """ allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"] # noqa: E501 - if database_language not in allowed_values: + if language not in allowed_values: raise ValueError( - "Invalid value for `database_language` ({0}), must be one of {1}" # noqa: E501 - .format(database_language, allowed_values) + "Invalid value for `language` ({0}), must be one of {1}" # noqa: E501 + .format(language, allowed_values) ) - self._database_language = database_language + self._language = language @property - def database_license(self): - """Gets the database_license of this DatabaseDto. # noqa: E501 + def license(self): + """Gets the license of this DatabaseDto. # noqa: E501 - :return: The database_license of this DatabaseDto. # noqa: E501 + :return: The license of this DatabaseDto. # noqa: E501 :rtype: LicenseDto """ - return self._database_license + return self._license - @database_license.setter - def database_license(self, database_license): - """Sets the database_license of this DatabaseDto. + @license.setter + def license(self, license): + """Sets the license of this DatabaseDto. - :param database_license: The database_license of this DatabaseDto. # noqa: E501 + :param license: The license of this DatabaseDto. # noqa: E501 :type: LicenseDto """ - self._database_license = database_license + self._license = license @property - def database_description(self): - """Gets the database_description of this DatabaseDto. # noqa: E501 + def description(self): + """Gets the description of this DatabaseDto. # noqa: E501 - :return: The database_description of this DatabaseDto. # noqa: E501 + :return: The description of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_description + return self._description - @database_description.setter - def database_description(self, database_description): - """Sets the database_description of this DatabaseDto. + @description.setter + def description(self, description): + """Sets the description of this DatabaseDto. - :param database_description: The database_description of this DatabaseDto. # noqa: E501 + :param description: The description of this DatabaseDto. # noqa: E501 :type: str """ - if database_description is None: - raise ValueError("Invalid value for `database_description`, must not be `None`") # noqa: E501 - self._database_description = database_description + self._description = description @property - def database_publisher(self): - """Gets the database_publisher of this DatabaseDto. # noqa: E501 + def publisher(self): + """Gets the publisher of this DatabaseDto. # noqa: E501 - :return: The database_publisher of this DatabaseDto. # noqa: E501 + :return: The publisher of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_publisher + return self._publisher - @database_publisher.setter - def database_publisher(self, database_publisher): - """Sets the database_publisher of this DatabaseDto. + @publisher.setter + def publisher(self, publisher): + """Sets the publisher of this DatabaseDto. - :param database_publisher: The database_publisher of this DatabaseDto. # noqa: E501 + :param publisher: The publisher of this DatabaseDto. # noqa: E501 :type: str """ - self._database_publisher = database_publisher + self._publisher = publisher @property - def database_contact_person(self): - """Gets the database_contact_person of this DatabaseDto. # noqa: E501 + def contact(self): + """Gets the contact of this DatabaseDto. # noqa: E501 - :return: The database_contact_person of this DatabaseDto. # noqa: E501 + :return: The contact of this DatabaseDto. # noqa: E501 :rtype: UserDto """ - return self._database_contact_person + return self._contact - @database_contact_person.setter - def database_contact_person(self, database_contact_person): - """Sets the database_contact_person of this DatabaseDto. + @contact.setter + def contact(self, contact): + """Sets the contact of this DatabaseDto. - :param database_contact_person: The database_contact_person of this DatabaseDto. # noqa: E501 + :param contact: The contact of this DatabaseDto. # noqa: E501 :type: UserDto """ - self._database_contact_person = database_contact_person + self._contact = contact @property def tables(self): @@ -379,25 +380,25 @@ class DatabaseDto(object): self._tables = tables @property - def database_container_image(self): - """Gets the database_container_image of this DatabaseDto. # noqa: E501 + def image(self): + """Gets the image of this DatabaseDto. # noqa: E501 - :return: The database_container_image of this DatabaseDto. # noqa: E501 + :return: The image of this DatabaseDto. # noqa: E501 :rtype: ImageDto """ - return self._database_container_image + return self._image - @database_container_image.setter - def database_container_image(self, database_container_image): - """Sets the database_container_image of this DatabaseDto. + @image.setter + def image(self, image): + """Sets the image of this DatabaseDto. - :param database_container_image: The database_container_image of this DatabaseDto. # noqa: E501 + :param image: The image of this DatabaseDto. # noqa: E501 :type: ImageDto """ - self._database_container_image = database_container_image + self._image = image @property def container(self): @@ -421,25 +422,25 @@ class DatabaseDto(object): self._container = container @property - def database_creation_time(self): - """Gets the database_creation_time of this DatabaseDto. # noqa: E501 + def created(self): + """Gets the created of this DatabaseDto. # noqa: E501 - :return: The database_creation_time of this DatabaseDto. # noqa: E501 + :return: The created of this DatabaseDto. # noqa: E501 :rtype: datetime """ - return self._database_creation_time + return self._created - @database_creation_time.setter - def database_creation_time(self, database_creation_time): - """Sets the database_creation_time of this DatabaseDto. + @created.setter + def created(self, created): + """Sets the created of this DatabaseDto. - :param database_creation_time: The database_creation_time of this DatabaseDto. # noqa: E501 + :param created: The created of this DatabaseDto. # noqa: E501 :type: datetime """ - self._database_creation_time = database_creation_time + self._created = created @property def deleted(self): @@ -463,111 +464,119 @@ class DatabaseDto(object): self._deleted = deleted @property - def database_internal_name(self): - """Gets the database_internal_name of this DatabaseDto. # noqa: E501 + def internal_name(self): + """Gets the internal_name of this DatabaseDto. # noqa: E501 - :return: The database_internal_name of this DatabaseDto. # noqa: E501 + :return: The internal_name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_internal_name + return self._internal_name - @database_internal_name.setter - def database_internal_name(self, database_internal_name): - """Sets the database_internal_name of this DatabaseDto. + @internal_name.setter + def internal_name(self, internal_name): + """Sets the internal_name of this DatabaseDto. - :param database_internal_name: The database_internal_name of this DatabaseDto. # noqa: E501 + :param internal_name: The internal_name of this DatabaseDto. # noqa: E501 :type: str """ - if database_internal_name is None: - raise ValueError("Invalid value for `database_internal_name`, must not be `None`") # noqa: E501 + if internal_name is None: + raise ValueError("Invalid value for `internal_name`, must not be `None`") # noqa: E501 - self._database_internal_name = database_internal_name + self._internal_name = internal_name @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseDto. # noqa: E501 + :return: The publication_year of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property - def database_publication_month(self): - """Gets the database_publication_month of this DatabaseDto. # noqa: E501 + def publication_month(self): + """Gets the publication_month of this DatabaseDto. # noqa: E501 + database publication month # noqa: E501 - :return: The database_publication_month of this DatabaseDto. # noqa: E501 + :return: The publication_month of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_month + return self._publication_month - @database_publication_month.setter - def database_publication_month(self, database_publication_month): - """Sets the database_publication_month of this DatabaseDto. + @publication_month.setter + def publication_month(self, publication_month): + """Sets the publication_month of this DatabaseDto. + database publication month # noqa: E501 - :param database_publication_month: The database_publication_month of this DatabaseDto. # noqa: E501 + :param publication_month: The publication_month of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_month = database_publication_month + self._publication_month = publication_month @property - def database_publication_day(self): - """Gets the database_publication_day of this DatabaseDto. # noqa: E501 + def publication_day(self): + """Gets the publication_day of this DatabaseDto. # noqa: E501 + database publication day # noqa: E501 - :return: The database_publication_day of this DatabaseDto. # noqa: E501 + :return: The publication_day of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_day + return self._publication_day - @database_publication_day.setter - def database_publication_day(self, database_publication_day): - """Sets the database_publication_day of this DatabaseDto. + @publication_day.setter + def publication_day(self, publication_day): + """Sets the publication_day of this DatabaseDto. + database publication day # noqa: E501 - :param database_publication_day: The database_publication_day of this DatabaseDto. # noqa: E501 + :param publication_day: The publication_day of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_day = database_publication_day + self._publication_day = publication_day @property - def database_public(self): - """Gets the database_public of this DatabaseDto. # noqa: E501 + def is_public(self): + """Gets the is_public of this DatabaseDto. # noqa: E501 + database publicity # noqa: E501 - :return: The database_public of this DatabaseDto. # noqa: E501 + :return: The is_public of this DatabaseDto. # noqa: E501 :rtype: bool """ - return self._database_public + return self._is_public - @database_public.setter - def database_public(self, database_public): - """Sets the database_public of this DatabaseDto. + @is_public.setter + def is_public(self, is_public): + """Sets the is_public of this DatabaseDto. + database publicity # noqa: E501 - :param database_public: The database_public of this DatabaseDto. # noqa: E501 + :param is_public: The is_public of this DatabaseDto. # noqa: E501 :type: bool """ - self._database_public = database_public + self._is_public = is_public def to_dict(self): """Returns the model properties as a dict""" diff --git a/swagger/api-container/swagger_client/models/image_change_dto.py b/swagger/api-container/swagger_client/models/image_change_dto.py index 8f8670d98a2be17539b7125ac0f7ba72d08f4c15..ee455f431a8444c195db6dd5edaa74358624cdd9 100644 --- a/swagger/api-container/swagger_client/models/image_change_dto.py +++ b/swagger/api-container/swagger_client/models/image_change_dto.py @@ -30,7 +30,6 @@ class ImageChangeDto(object): swagger_types = { 'default_port': 'int', 'environment': 'list[ImageEnvItemDto]', - 'logo': 'str', 'dialect': 'str', 'driver_class': 'str', 'jdbc_method': 'str' @@ -39,17 +38,15 @@ class ImageChangeDto(object): attribute_map = { 'default_port': 'defaultPort', 'environment': 'environment', - 'logo': 'logo', 'dialect': 'dialect', 'driver_class': 'driver_class', 'jdbc_method': 'jdbc_method' } - def __init__(self, default_port=None, environment=None, logo=None, dialect=None, driver_class=None, jdbc_method=None): # noqa: E501 + def __init__(self, default_port=None, environment=None, dialect=None, driver_class=None, jdbc_method=None): # noqa: E501 """ImageChangeDto - a model defined in Swagger""" # noqa: E501 self._default_port = None self._environment = None - self._logo = None self._dialect = None self._driver_class = None self._jdbc_method = None @@ -58,7 +55,6 @@ class ImageChangeDto(object): self.default_port = default_port if environment is not None: self.environment = environment - self.logo = logo self.dialect = dialect self.driver_class = driver_class self.jdbc_method = jdbc_method @@ -105,29 +101,6 @@ class ImageChangeDto(object): self._environment = environment - @property - def logo(self): - """Gets the logo of this ImageChangeDto. # noqa: E501 - - - :return: The logo of this ImageChangeDto. # noqa: E501 - :rtype: str - """ - return self._logo - - @logo.setter - def logo(self, logo): - """Sets the logo of this ImageChangeDto. - - - :param logo: The logo of this ImageChangeDto. # noqa: E501 - :type: str - """ - if logo is None: - raise ValueError("Invalid value for `logo`, must not be `None`") # noqa: E501 - - self._logo = logo - @property def dialect(self): """Gets the dialect of this ImageChangeDto. # noqa: E501 diff --git a/swagger/api-container/swagger_client/models/image_create_dto.py b/swagger/api-container/swagger_client/models/image_create_dto.py index 4327dc7534112d9ef634a8bd223f140c38315c1e..43bf86e8f014a28de06c5b073689837b52d9be85 100644 --- a/swagger/api-container/swagger_client/models/image_create_dto.py +++ b/swagger/api-container/swagger_client/models/image_create_dto.py @@ -31,8 +31,6 @@ class ImageCreateDto(object): 'repository': 'str', 'tag': 'str', 'dialect': 'str', - 'logo': 'str', - 'local': 'bool', 'environment': 'list[ImageEnvItemDto]', 'driver_class': 'str', 'jdbc_method': 'str', @@ -43,21 +41,17 @@ class ImageCreateDto(object): 'repository': 'repository', 'tag': 'tag', 'dialect': 'dialect', - 'logo': 'logo', - 'local': 'local', 'environment': 'environment', 'driver_class': 'driver_class', 'jdbc_method': 'jdbc_method', 'default_port': 'default_port' } - def __init__(self, repository=None, tag=None, dialect=None, logo=None, local=None, environment=None, driver_class=None, jdbc_method=None, default_port=None): # noqa: E501 + def __init__(self, repository=None, tag=None, dialect=None, environment=None, driver_class=None, jdbc_method=None, default_port=None): # noqa: E501 """ImageCreateDto - a model defined in Swagger""" # noqa: E501 self._repository = None self._tag = None self._dialect = None - self._logo = None - self._local = None self._environment = None self._driver_class = None self._jdbc_method = None @@ -66,8 +60,6 @@ class ImageCreateDto(object): self.repository = repository self.tag = tag self.dialect = dialect - self.logo = logo - self.local = local if environment is not None: self.environment = environment self.driver_class = driver_class @@ -143,52 +135,6 @@ class ImageCreateDto(object): self._dialect = dialect - @property - def logo(self): - """Gets the logo of this ImageCreateDto. # noqa: E501 - - - :return: The logo of this ImageCreateDto. # noqa: E501 - :rtype: str - """ - return self._logo - - @logo.setter - def logo(self, logo): - """Sets the logo of this ImageCreateDto. - - - :param logo: The logo of this ImageCreateDto. # noqa: E501 - :type: str - """ - if logo is None: - raise ValueError("Invalid value for `logo`, must not be `None`") # noqa: E501 - - self._logo = logo - - @property - def local(self): - """Gets the local of this ImageCreateDto. # noqa: E501 - - - :return: The local of this ImageCreateDto. # noqa: E501 - :rtype: bool - """ - return self._local - - @local.setter - def local(self, local): - """Sets the local of this ImageCreateDto. - - - :param local: The local of this ImageCreateDto. # noqa: E501 - :type: bool - """ - if local is None: - raise ValueError("Invalid value for `local`, must not be `None`") # noqa: E501 - - self._local = local - @property def environment(self): """Gets the environment of this ImageCreateDto. # noqa: E501 diff --git a/swagger/api-container/swagger_client/models/image_env_item_dto.py b/swagger/api-container/swagger_client/models/image_env_item_dto.py index 5f77c61e3604cc1446733d653d6ea5c9a8f4c0a5..e414cf91202f219a15c36661940fe394e084a7da 100644 --- a/swagger/api-container/swagger_client/models/image_env_item_dto.py +++ b/swagger/api-container/swagger_client/models/image_env_item_dto.py @@ -51,8 +51,7 @@ class ImageEnvItemDto(object): self.iid = iid self.key = key self.value = value - if type is not None: - self.type = type + self.type = type @property def iid(self): @@ -141,7 +140,9 @@ class ImageEnvItemDto(object): :param type: The type of this ImageEnvItemDto. # noqa: E501 :type: str """ - allowed_values = ["USERNAME", "PASSWORD", "PRIVILEGED_USERNAME", "PRIVILEGED_PASSWORD"] # noqa: E501 + if type is None: + raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501 + allowed_values = ["username", "password", "privileged_username", "privileged_password"] # noqa: E501 if type not in allowed_values: raise ValueError( "Invalid value for `type` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-container/swagger_client/models/user_brief_dto.py b/swagger/api-container/swagger_client/models/user_brief_dto.py index 4ca5e34dcb464f9ba974617485f62ba5e74da8f9..15e5e217a9b1cc3b4ee91e65f422dc782a4c37ac 100644 --- a/swagger/api-container/swagger_client/models/user_brief_dto.py +++ b/swagger/api-container/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/api-container/swagger_client/models/user_dto.py b/swagger/api-container/swagger_client/models/user_dto.py index 1d4b0bbf7f7aa3c801b4b2ae734fac286b9a5a87..3d1b14417ef4405b97be22e752df7c5144127a49 100644 --- a/swagger/api-container/swagger_client/models/user_dto.py +++ b/swagger/api-container/swagger_client/models/user_dto.py @@ -155,6 +155,7 @@ class UserDto(object): def username(self): """Gets the username of this UserDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserDto. # noqa: E501 :rtype: str @@ -165,6 +166,7 @@ class UserDto(object): def username(self, username): """Sets the username of this UserDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserDto. # noqa: E501 :type: str diff --git a/swagger/api-database.yaml b/swagger/api-database.yaml index 9130e6a5688b851208fd740b20060ad36149a8e1..96557e91e82ab043b972624d765fa50184d6faf0 100644 --- a/swagger/api-database.yaml +++ b/swagger/api-database.yaml @@ -19,7 +19,7 @@ paths: /api/container/{id}/database/{databaseId}: get: tags: - - container-database-endpoint + - database-endpoint summary: Find some database operationId: findById parameters: @@ -82,7 +82,7 @@ paths: - bearerAuth: [] put: tags: - - container-database-endpoint + - database-endpoint summary: Update database operationId: update parameters: @@ -151,7 +151,7 @@ paths: - bearerAuth: [] delete: tags: - - container-database-endpoint + - database-endpoint summary: Delete some database operationId: delete_1 parameters: @@ -215,7 +215,7 @@ paths: /api/container/{id}/database/{databaseId}/transfer: put: tags: - - container-database-endpoint + - database-endpoint summary: Update database operationId: transfer parameters: @@ -285,7 +285,7 @@ paths: /api/container/{id}/database: get: tags: - - container-database-endpoint + - database-endpoint summary: List databases operationId: findAll parameters: @@ -342,7 +342,7 @@ paths: $ref: '#/components/schemas/DatabaseBriefDto' post: tags: - - container-database-endpoint + - database-endpoint summary: Create database operationId: create parameters: @@ -472,6 +472,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -543,12 +544,14 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound DatabaseModifyDto: required: - - database publication year - description + - publication_year type: object properties: subjects: @@ -557,12 +560,15 @@ components: type: string description: type: string + example: Air Quality in Austria publisher: type: string + example: TU Wien license: $ref: '#/components/schemas/LicenseDto' language: type: string + example: en enum: - ab - aa @@ -748,19 +754,25 @@ components: - yo - za - zu - database publication year: + publication_year: type: integer + description: database publication year format: int32 + example: 2022 publication_month: maximum: 12 minimum: 1 type: integer + description: database publication month format: int32 + example: 12 publication_day: maximum: 31 minimum: 1 type: integer + description: database publication day format: int32 + example: 15 contact_person: type: string LicenseDto: @@ -771,8 +783,10 @@ components: properties: identifier: type: string + example: MIT uri: type: string + example: https://opensource.org/licenses/MIT ContainerDto: required: - created @@ -787,17 +801,20 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality state: type: string + example: running enum: - - ContainerStateDto.CREATED - - ContainerStateDto.RESTARTING - - ContainerStateDto.RUNNING - - ContainerStateDto.PAUSED - - ContainerStateDto.EXITED - - ContainerStateDto.DEAD + - created + - restarting + - running + - paused + - exited + - dead databases: type: array items: @@ -810,38 +827,41 @@ components: created: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z internal_name: type: string + example: air-quality ip_address: type: string DatabaseDto: required: - - database creator - - database description - - database exchange - - database id - - database internal name - - database name + - creator + - exchange + - id + - internal_name + - name type: object properties: - database id: + id: type: integer format: int64 - example: 1 - database name: + name: type: string - example: Weather Australia - database exchange: + example: Air Quality + exchange: type: string - database creator: + example: air_quality + creator: $ref: '#/components/schemas/UserBriefDto' - database subjects: + subjects: type: array + description: database subjects items: type: string - database language: + description: database subjects + language: type: string - example: EN + example: en enum: - ab - aa @@ -1027,49 +1047,58 @@ components: - yo - za - zu - database license: + license: $ref: '#/components/schemas/LicenseDto' - database description: + description: type: string - example: Weather Australia 2009-2021 - database publisher: + example: Air Quality in Austria + publisher: type: string example: TU Wien - database contact person: + contact: $ref: '#/components/schemas/UserDto' tables: type: array items: $ref: '#/components/schemas/TableBriefDto' - database container image: + image: $ref: '#/components/schemas/ImageDto' container: $ref: '#/components/schemas/ContainerDto' - database creation time: + created: type: string format: date-time deleted: type: string format: date-time - database internal name: + internal_name: type: string - example: weather_australia - database publication year: + example: air_quality + publication_year: type: integer + description: database publication year format: int32 - database publication month: + example: 2022 + publication_month: type: integer + description: database publication month format: int32 - database publication day: + example: 12 + publication_day: type: integer + description: database publication day format: int32 - database public: + example: 15 + is_public: type: boolean + description: database publicity + example: true GrantedAuthorityDto: type: object properties: authority: type: string + example: ROLE_RESEARCHER ImageBriefDto: required: - id @@ -1082,8 +1111,10 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" ImageDateDto: required: - database_format @@ -1098,12 +1129,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -1124,36 +1159,46 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" dialect: type: string + example: org.hibernate.dialect.MariaDBDialect hash: type: string + example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e compiled: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z size: type: integer + example: 314295447 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' driver_class: type: string + example: org.mariadb.jdbc.Driver date_formats: type: array items: $ref: '#/components/schemas/ImageDateDto' jdbc_method: type: string + example: mariadb default_port: type: integer format: int32 + example: 3306 ImageEnvItemDto: required: - iid - key + - type - value type: object properties: @@ -1162,15 +1207,18 @@ components: format: int64 key: type: string + example: MARIADB_ROOT_PASSWORD value: type: string + example: mariadb type: type: string + example: PRIVILEGED_PASSWORD enum: - - USERNAME - - PASSWORD - - PRIVILEGED_USERNAME - - PRIVILEGED_PASSWORD + - username + - password + - privileged_username + - privileged_password TableBriefDto: required: - creator @@ -1184,10 +1232,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserBriefDto: required: - email_verified @@ -1201,22 +1251,31 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true UserDto: required: - email @@ -1235,14 +1294,20 @@ components: $ref: '#/components/schemas/GrantedAuthorityDto' username: type: string + description: Only contains lowercase characters + example: jcarberry firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 containers: type: array items: @@ -1257,14 +1322,18 @@ components: $ref: '#/components/schemas/ContainerDto' email: type: string + example: jcarberry@brown.edu titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true DatabaseTransferDto: required: - is_public @@ -1272,6 +1341,7 @@ components: properties: is_public: type: boolean + example: true DatabaseCreateDto: required: - is_public @@ -1280,8 +1350,10 @@ components: properties: name: type: string + example: Air Quality is_public: type: boolean + example: true ContainerBriefDto: required: - hash @@ -1295,8 +1367,10 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' created: @@ -1304,6 +1378,7 @@ components: format: date-time internal_name: type: string + example: air-quality DatabaseBriefDto: required: - id @@ -1315,10 +1390,13 @@ components: format: int64 name: type: string + example: Air Quality description: type: string + example: Air Quality in Austria engine: type: string + example: mariadb:10.5 container: $ref: '#/components/schemas/ContainerBriefDto' creator: @@ -1328,6 +1406,7 @@ components: format: date-time is_public: type: boolean + example: true securitySchemes: bearerAuth: type: http diff --git a/swagger/api-database/README.md b/swagger/api-database/README.md index f1e4e1f36f4054e113a3d326a6bdcbab33436f71..4ff1f1a4e84db3ce349bc820d9d11f6562531d3f 100644 --- a/swagger/api-database/README.md +++ b/swagger/api-database/README.md @@ -53,7 +53,7 @@ from pprint import pprint # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) body = swagger_client.DatabaseCreateDto() # DatabaseCreateDto | id = 789 # int | @@ -62,11 +62,11 @@ try: api_response = api_instance.create(body, id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->create: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->create: %s\n" % e) # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) id = 789 # int | database_id = 789 # int | @@ -75,10 +75,10 @@ try: api_response = api_instance.delete1(id, database_id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->delete1: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->delete1: %s\n" % e) # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) id = 789 # int | try: @@ -86,11 +86,11 @@ try: api_response = api_instance.find_all(id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->find_all: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->find_all: %s\n" % e) # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) id = 789 # int | database_id = 789 # int | @@ -99,11 +99,11 @@ try: api_response = api_instance.find_by_id(id, database_id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->find_by_id: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->find_by_id: %s\n" % e) # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) body = swagger_client.DatabaseTransferDto() # DatabaseTransferDto | id = 789 # int | database_id = 789 # int | @@ -113,11 +113,11 @@ try: api_response = api_instance.transfer(body, id, database_id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->transfer: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->transfer: %s\n" % e) # create an instance of the API class -api_instance = swagger_client.ContainerDatabaseEndpointApi(swagger_client.ApiClient(configuration)) +api_instance = swagger_client.DatabaseEndpointApi(swagger_client.ApiClient(configuration)) body = swagger_client.DatabaseModifyDto() # DatabaseModifyDto | id = 789 # int | database_id = 789 # int | @@ -127,7 +127,7 @@ try: api_response = api_instance.update(body, id, database_id) pprint(api_response) except ApiException as e: - print("Exception when calling ContainerDatabaseEndpointApi->update: %s\n" % e) + print("Exception when calling DatabaseEndpointApi->update: %s\n" % e) ``` ## Documentation for API Endpoints @@ -136,12 +136,12 @@ All URIs are relative to *http://localhost:9092* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*ContainerDatabaseEndpointApi* | [**create**](docs/ContainerDatabaseEndpointApi.md#create) | **POST** /api/container/{id}/database | Create database -*ContainerDatabaseEndpointApi* | [**delete1**](docs/ContainerDatabaseEndpointApi.md#delete1) | **DELETE** /api/container/{id}/database/{databaseId} | Delete some database -*ContainerDatabaseEndpointApi* | [**find_all**](docs/ContainerDatabaseEndpointApi.md#find_all) | **GET** /api/container/{id}/database | List databases -*ContainerDatabaseEndpointApi* | [**find_by_id**](docs/ContainerDatabaseEndpointApi.md#find_by_id) | **GET** /api/container/{id}/database/{databaseId} | Find some database -*ContainerDatabaseEndpointApi* | [**transfer**](docs/ContainerDatabaseEndpointApi.md#transfer) | **PUT** /api/container/{id}/database/{databaseId}/transfer | Update database -*ContainerDatabaseEndpointApi* | [**update**](docs/ContainerDatabaseEndpointApi.md#update) | **PUT** /api/container/{id}/database/{databaseId} | Update database +*DatabaseEndpointApi* | [**create**](docs/DatabaseEndpointApi.md#create) | **POST** /api/container/{id}/database | Create database +*DatabaseEndpointApi* | [**delete1**](docs/DatabaseEndpointApi.md#delete1) | **DELETE** /api/container/{id}/database/{databaseId} | Delete some database +*DatabaseEndpointApi* | [**find_all**](docs/DatabaseEndpointApi.md#find_all) | **GET** /api/container/{id}/database | List databases +*DatabaseEndpointApi* | [**find_by_id**](docs/DatabaseEndpointApi.md#find_by_id) | **GET** /api/container/{id}/database/{databaseId} | Find some database +*DatabaseEndpointApi* | [**transfer**](docs/DatabaseEndpointApi.md#transfer) | **PUT** /api/container/{id}/database/{databaseId}/transfer | Update database +*DatabaseEndpointApi* | [**update**](docs/DatabaseEndpointApi.md#update) | **PUT** /api/container/{id}/database/{databaseId} | Update database *LicenseEndpointApi* | [**delete**](docs/LicenseEndpointApi.md#delete) | **GET** /api/container/{id}/database/license | Get all licenses ## Documentation For Models diff --git a/swagger/api-database/swagger_client/__init__.py b/swagger/api-database/swagger_client/__init__.py index 38e826da48d705d67c17a4619c360ddff08bcc67..6d3b89f86ba6e15d450dc9be187ef07f8232bb67 100644 --- a/swagger/api-database/swagger_client/__init__.py +++ b/swagger/api-database/swagger_client/__init__.py @@ -15,7 +15,7 @@ from __future__ import absolute_import # import apis into sdk package -from swagger_client.api.container_database_endpoint_api import ContainerDatabaseEndpointApi +from swagger_client.api.database_endpoint_api import DatabaseEndpointApi from swagger_client.api.license_endpoint_api import LicenseEndpointApi # import ApiClient from swagger_client.api_client import ApiClient diff --git a/swagger/api-database/swagger_client/api/__init__.py b/swagger/api-database/swagger_client/api/__init__.py index e38f756960fbd0b208f8155cdeee3c2c0805d62a..3743310fe7a20b355ba4c290bc658889dce860ec 100644 --- a/swagger/api-database/swagger_client/api/__init__.py +++ b/swagger/api-database/swagger_client/api/__init__.py @@ -3,5 +3,5 @@ from __future__ import absolute_import # flake8: noqa # import apis into api package -from swagger_client.api.container_database_endpoint_api import ContainerDatabaseEndpointApi +from swagger_client.api.database_endpoint_api import DatabaseEndpointApi from swagger_client.api.license_endpoint_api import LicenseEndpointApi diff --git a/swagger/api-database/swagger_client/api/database_endpoint_api.py b/swagger/api-database/swagger_client/api/database_endpoint_api.py new file mode 100644 index 0000000000000000000000000000000000000000..c0612158432649c3e412c4ff95d9eff0396b9d52 --- /dev/null +++ b/swagger/api-database/swagger_client/api/database_endpoint_api.py @@ -0,0 +1,659 @@ +# coding: utf-8 + +""" + Database Repository Database Service API + + Service that manages the databases # noqa: E501 + + OpenAPI spec version: 1.1.0-alpha + Contact: andreas.rauber@tuwien.ac.at + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +from __future__ import absolute_import + +import re # noqa: F401 + +# python 2 and python 3 compatibility library +import six + +from swagger_client.api_client import ApiClient + + +class DatabaseEndpointApi(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + Ref: https://github.com/swagger-api/swagger-codegen + """ + + def __init__(self, api_client=None): + if api_client is None: + api_client = ApiClient() + self.api_client = api_client + + def create(self, body, id, **kwargs): # noqa: E501 + """Create database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.create(body, id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseCreateDto body: (required) + :param int id: (required) + :return: DatabaseBriefDto + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.create_with_http_info(body, id, **kwargs) # noqa: E501 + else: + (data) = self.create_with_http_info(body, id, **kwargs) # noqa: E501 + return data + + def create_with_http_info(self, body, id, **kwargs): # noqa: E501 + """Create database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.create_with_http_info(body, id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseCreateDto body: (required) + :param int id: (required) + :return: DatabaseBriefDto + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['body', 'id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method create" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'body' is set + if ('body' not in params or + params['body'] is None): + raise ValueError("Missing the required parameter `body` when calling `create`") # noqa: E501 + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `create`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + if 'body' in params: + body_params = params['body'] + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # HTTP header `Content-Type` + header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 + ['application/json']) # noqa: E501 + + # Authentication setting + auth_settings = ['bearerAuth'] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database', 'POST', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='DatabaseBriefDto', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + + def delete1(self, id, database_id, **kwargs): # noqa: E501 + """Delete some database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.delete1(id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :param int database_id: (required) + :return: object + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.delete1_with_http_info(id, database_id, **kwargs) # noqa: E501 + else: + (data) = self.delete1_with_http_info(id, database_id, **kwargs) # noqa: E501 + return data + + def delete1_with_http_info(self, id, database_id, **kwargs): # noqa: E501 + """Delete some database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.delete1_with_http_info(id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :param int database_id: (required) + :return: object + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['id', 'database_id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method delete1" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `delete1`") # noqa: E501 + # verify the required parameter 'database_id' is set + if ('database_id' not in params or + params['database_id'] is None): + raise ValueError("Missing the required parameter `database_id` when calling `delete1`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + if 'database_id' in params: + path_params['databaseId'] = params['database_id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # Authentication setting + auth_settings = ['bearerAuth'] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database/{databaseId}', 'DELETE', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='object', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + + def find_all(self, id, **kwargs): # noqa: E501 + """List databases # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.find_all(id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :return: list[DatabaseBriefDto] + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.find_all_with_http_info(id, **kwargs) # noqa: E501 + else: + (data) = self.find_all_with_http_info(id, **kwargs) # noqa: E501 + return data + + def find_all_with_http_info(self, id, **kwargs): # noqa: E501 + """List databases # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.find_all_with_http_info(id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :return: list[DatabaseBriefDto] + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method find_all" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `find_all`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # Authentication setting + auth_settings = [] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database', 'GET', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='list[DatabaseBriefDto]', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + + def find_by_id(self, id, database_id, **kwargs): # noqa: E501 + """Find some database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.find_by_id(id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.find_by_id_with_http_info(id, database_id, **kwargs) # noqa: E501 + else: + (data) = self.find_by_id_with_http_info(id, database_id, **kwargs) # noqa: E501 + return data + + def find_by_id_with_http_info(self, id, database_id, **kwargs): # noqa: E501 + """Find some database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.find_by_id_with_http_info(id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['id', 'database_id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method find_by_id" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `find_by_id`") # noqa: E501 + # verify the required parameter 'database_id' is set + if ('database_id' not in params or + params['database_id'] is None): + raise ValueError("Missing the required parameter `database_id` when calling `find_by_id`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + if 'database_id' in params: + path_params['databaseId'] = params['database_id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # Authentication setting + auth_settings = ['bearerAuth'] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database/{databaseId}', 'GET', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='DatabaseDto', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + + def transfer(self, body, id, database_id, **kwargs): # noqa: E501 + """Update database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.transfer(body, id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseTransferDto body: (required) + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.transfer_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + else: + (data) = self.transfer_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + return data + + def transfer_with_http_info(self, body, id, database_id, **kwargs): # noqa: E501 + """Update database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.transfer_with_http_info(body, id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseTransferDto body: (required) + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['body', 'id', 'database_id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method transfer" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'body' is set + if ('body' not in params or + params['body'] is None): + raise ValueError("Missing the required parameter `body` when calling `transfer`") # noqa: E501 + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `transfer`") # noqa: E501 + # verify the required parameter 'database_id' is set + if ('database_id' not in params or + params['database_id'] is None): + raise ValueError("Missing the required parameter `database_id` when calling `transfer`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + if 'database_id' in params: + path_params['databaseId'] = params['database_id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + if 'body' in params: + body_params = params['body'] + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # HTTP header `Content-Type` + header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 + ['application/json']) # noqa: E501 + + # Authentication setting + auth_settings = ['bearerAuth'] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database/{databaseId}/transfer', 'PUT', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='DatabaseDto', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) + + def update(self, body, id, database_id, **kwargs): # noqa: E501 + """Update database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.update(body, id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseModifyDto body: (required) + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.update_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + else: + (data) = self.update_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + return data + + def update_with_http_info(self, body, id, database_id, **kwargs): # noqa: E501 + """Update database # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.update_with_http_info(body, id, database_id, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param DatabaseModifyDto body: (required) + :param int id: (required) + :param int database_id: (required) + :return: DatabaseDto + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['body', 'id', 'database_id'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method update" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'body' is set + if ('body' not in params or + params['body'] is None): + raise ValueError("Missing the required parameter `body` when calling `update`") # noqa: E501 + # verify the required parameter 'id' is set + if ('id' not in params or + params['id'] is None): + raise ValueError("Missing the required parameter `id` when calling `update`") # noqa: E501 + # verify the required parameter 'database_id' is set + if ('database_id' not in params or + params['database_id'] is None): + raise ValueError("Missing the required parameter `database_id` when calling `update`") # noqa: E501 + + collection_formats = {} + + path_params = {} + if 'id' in params: + path_params['id'] = params['id'] # noqa: E501 + if 'database_id' in params: + path_params['databaseId'] = params['database_id'] # noqa: E501 + + query_params = [] + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + if 'body' in params: + body_params = params['body'] + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['*/*']) # noqa: E501 + + # HTTP header `Content-Type` + header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501 + ['application/json']) # noqa: E501 + + # Authentication setting + auth_settings = ['bearerAuth'] # noqa: E501 + + return self.api_client.call_api( + '/api/container/{id}/database/{databaseId}', 'PUT', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='DatabaseDto', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) diff --git a/swagger/api-database/swagger_client/models/container_dto.py b/swagger/api-database/swagger_client/models/container_dto.py index 8aec8c1ceebd97e3dc2e757e61b7629d9926ceb6..1ab9e4195efa179e64077d6c9a8e62938cd10c24 100644 --- a/swagger/api-database/swagger_client/models/container_dto.py +++ b/swagger/api-database/swagger_client/models/container_dto.py @@ -169,7 +169,7 @@ class ContainerDto(object): :param state: The state of this ContainerDto. # noqa: E501 :type: str """ - allowed_values = ["ContainerStateDto.CREATED", "ContainerStateDto.RESTARTING", "ContainerStateDto.RUNNING", "ContainerStateDto.PAUSED", "ContainerStateDto.EXITED", "ContainerStateDto.DEAD"] # noqa: E501 + allowed_values = ["created", "restarting", "running", "paused", "exited", "dead"] # noqa: E501 if state not in allowed_values: raise ValueError( "Invalid value for `state` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-database/swagger_client/models/database_dto.py b/swagger/api-database/swagger_client/models/database_dto.py index 56899bd1051f4bf6440c22f309aae45d1d9c4e3f..a9abee5127956007bff7f1388a5384627a74cead 100644 --- a/swagger/api-database/swagger_client/models/database_dto.py +++ b/swagger/api-database/swagger_client/models/database_dto.py @@ -28,334 +28,335 @@ class DatabaseDto(object): and the value is json key in definition. """ swagger_types = { - 'database_id': 'int', - 'database_name': 'str', - 'database_exchange': 'str', - 'database_creator': 'UserBriefDto', - 'database_subjects': 'list[str]', - 'database_language': 'str', - 'database_license': 'LicenseDto', - 'database_description': 'str', - 'database_publisher': 'str', - 'database_contact_person': 'UserDto', + 'id': 'int', + 'name': 'str', + 'exchange': 'str', + 'creator': 'UserBriefDto', + 'subjects': 'list[str]', + 'language': 'str', + 'license': 'LicenseDto', + 'description': 'str', + 'publisher': 'str', + 'contact': 'UserDto', 'tables': 'list[TableBriefDto]', - 'database_container_image': 'ImageDto', + 'image': 'ImageDto', 'container': 'ContainerDto', - 'database_creation_time': 'datetime', + 'created': 'datetime', 'deleted': 'datetime', - 'database_internal_name': 'str', - 'database_publication_year': 'int', - 'database_publication_month': 'int', - 'database_publication_day': 'int', - 'database_public': 'bool' + 'internal_name': 'str', + 'publication_year': 'int', + 'publication_month': 'int', + 'publication_day': 'int', + 'is_public': 'bool' } attribute_map = { - 'database_id': 'database id', - 'database_name': 'database name', - 'database_exchange': 'database exchange', - 'database_creator': 'database creator', - 'database_subjects': 'database subjects', - 'database_language': 'database language', - 'database_license': 'database license', - 'database_description': 'database description', - 'database_publisher': 'database publisher', - 'database_contact_person': 'database contact person', + 'id': 'id', + 'name': 'name', + 'exchange': 'exchange', + 'creator': 'creator', + 'subjects': 'subjects', + 'language': 'language', + 'license': 'license', + 'description': 'description', + 'publisher': 'publisher', + 'contact': 'contact', 'tables': 'tables', - 'database_container_image': 'database container image', + 'image': 'image', 'container': 'container', - 'database_creation_time': 'database creation time', + 'created': 'created', 'deleted': 'deleted', - 'database_internal_name': 'database internal name', - 'database_publication_year': 'database publication year', - 'database_publication_month': 'database publication month', - 'database_publication_day': 'database publication day', - 'database_public': 'database public' + 'internal_name': 'internal_name', + 'publication_year': 'publication_year', + 'publication_month': 'publication_month', + 'publication_day': 'publication_day', + 'is_public': 'is_public' } - def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None): # noqa: E501 + def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None): # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501 - self._database_id = None - self._database_name = None - self._database_exchange = None - self._database_creator = None - self._database_subjects = None - self._database_language = None - self._database_license = None - self._database_description = None - self._database_publisher = None - self._database_contact_person = None + self._id = None + self._name = None + self._exchange = None + self._creator = None + self._subjects = None + self._language = None + self._license = None + self._description = None + self._publisher = None + self._contact = None self._tables = None - self._database_container_image = None + self._image = None self._container = None - self._database_creation_time = None + self._created = None self._deleted = None - self._database_internal_name = None - self._database_publication_year = None - self._database_publication_month = None - self._database_publication_day = None - self._database_public = None + self._internal_name = None + self._publication_year = None + self._publication_month = None + self._publication_day = None + self._is_public = None self.discriminator = None - self.database_id = database_id - self.database_name = database_name - self.database_exchange = database_exchange - self.database_creator = database_creator - if database_subjects is not None: - self.database_subjects = database_subjects - if database_language is not None: - self.database_language = database_language - if database_license is not None: - self.database_license = database_license - self.database_description = database_description - if database_publisher is not None: - self.database_publisher = database_publisher - if database_contact_person is not None: - self.database_contact_person = database_contact_person + self.id = id + self.name = name + self.exchange = exchange + self.creator = creator + if subjects is not None: + self.subjects = subjects + if language is not None: + self.language = language + if license is not None: + self.license = license + if description is not None: + self.description = description + if publisher is not None: + self.publisher = publisher + if contact is not None: + self.contact = contact if tables is not None: self.tables = tables - if database_container_image is not None: - self.database_container_image = database_container_image + if image is not None: + self.image = image if container is not None: self.container = container - if database_creation_time is not None: - self.database_creation_time = database_creation_time + if created is not None: + self.created = created if deleted is not None: self.deleted = deleted - self.database_internal_name = database_internal_name - if database_publication_year is not None: - self.database_publication_year = database_publication_year - if database_publication_month is not None: - self.database_publication_month = database_publication_month - if database_publication_day is not None: - self.database_publication_day = database_publication_day - if database_public is not None: - self.database_public = database_public + self.internal_name = internal_name + if publication_year is not None: + self.publication_year = publication_year + if publication_month is not None: + self.publication_month = publication_month + if publication_day is not None: + self.publication_day = publication_day + if is_public is not None: + self.is_public = is_public @property - def database_id(self): - """Gets the database_id of this DatabaseDto. # noqa: E501 + def id(self): + """Gets the id of this DatabaseDto. # noqa: E501 - :return: The database_id of this DatabaseDto. # noqa: E501 + :return: The id of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_id + return self._id - @database_id.setter - def database_id(self, database_id): - """Sets the database_id of this DatabaseDto. + @id.setter + def id(self, id): + """Sets the id of this DatabaseDto. - :param database_id: The database_id of this DatabaseDto. # noqa: E501 + :param id: The id of this DatabaseDto. # noqa: E501 :type: int """ - if database_id is None: - raise ValueError("Invalid value for `database_id`, must not be `None`") # noqa: E501 + if id is None: + raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501 - self._database_id = database_id + self._id = id @property - def database_name(self): - """Gets the database_name of this DatabaseDto. # noqa: E501 + def name(self): + """Gets the name of this DatabaseDto. # noqa: E501 - :return: The database_name of this DatabaseDto. # noqa: E501 + :return: The name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_name + return self._name - @database_name.setter - def database_name(self, database_name): - """Sets the database_name of this DatabaseDto. + @name.setter + def name(self, name): + """Sets the name of this DatabaseDto. - :param database_name: The database_name of this DatabaseDto. # noqa: E501 + :param name: The name of this DatabaseDto. # noqa: E501 :type: str """ - if database_name is None: - raise ValueError("Invalid value for `database_name`, must not be `None`") # noqa: E501 + if name is None: + raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 - self._database_name = database_name + self._name = name @property - def database_exchange(self): - """Gets the database_exchange of this DatabaseDto. # noqa: E501 + def exchange(self): + """Gets the exchange of this DatabaseDto. # noqa: E501 - :return: The database_exchange of this DatabaseDto. # noqa: E501 + :return: The exchange of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_exchange + return self._exchange - @database_exchange.setter - def database_exchange(self, database_exchange): - """Sets the database_exchange of this DatabaseDto. + @exchange.setter + def exchange(self, exchange): + """Sets the exchange of this DatabaseDto. - :param database_exchange: The database_exchange of this DatabaseDto. # noqa: E501 + :param exchange: The exchange of this DatabaseDto. # noqa: E501 :type: str """ - if database_exchange is None: - raise ValueError("Invalid value for `database_exchange`, must not be `None`") # noqa: E501 + if exchange is None: + raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501 - self._database_exchange = database_exchange + self._exchange = exchange @property - def database_creator(self): - """Gets the database_creator of this DatabaseDto. # noqa: E501 + def creator(self): + """Gets the creator of this DatabaseDto. # noqa: E501 - :return: The database_creator of this DatabaseDto. # noqa: E501 + :return: The creator of this DatabaseDto. # noqa: E501 :rtype: UserBriefDto """ - return self._database_creator + return self._creator - @database_creator.setter - def database_creator(self, database_creator): - """Sets the database_creator of this DatabaseDto. + @creator.setter + def creator(self, creator): + """Sets the creator of this DatabaseDto. - :param database_creator: The database_creator of this DatabaseDto. # noqa: E501 + :param creator: The creator of this DatabaseDto. # noqa: E501 :type: UserBriefDto """ - if database_creator is None: - raise ValueError("Invalid value for `database_creator`, must not be `None`") # noqa: E501 + if creator is None: + raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 - self._database_creator = database_creator + self._creator = creator @property - def database_subjects(self): - """Gets the database_subjects of this DatabaseDto. # noqa: E501 + def subjects(self): + """Gets the subjects of this DatabaseDto. # noqa: E501 + database subjects # noqa: E501 - :return: The database_subjects of this DatabaseDto. # noqa: E501 + :return: The subjects of this DatabaseDto. # noqa: E501 :rtype: list[str] """ - return self._database_subjects + return self._subjects - @database_subjects.setter - def database_subjects(self, database_subjects): - """Sets the database_subjects of this DatabaseDto. + @subjects.setter + def subjects(self, subjects): + """Sets the subjects of this DatabaseDto. + database subjects # noqa: E501 - :param database_subjects: The database_subjects of this DatabaseDto. # noqa: E501 + :param subjects: The subjects of this DatabaseDto. # noqa: E501 :type: list[str] """ - self._database_subjects = database_subjects + self._subjects = subjects @property - def database_language(self): - """Gets the database_language of this DatabaseDto. # noqa: E501 + def language(self): + """Gets the language of this DatabaseDto. # noqa: E501 - :return: The database_language of this DatabaseDto. # noqa: E501 + :return: The language of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_language + return self._language - @database_language.setter - def database_language(self, database_language): - """Sets the database_language of this DatabaseDto. + @language.setter + def language(self, language): + """Sets the language of this DatabaseDto. - :param database_language: The database_language of this DatabaseDto. # noqa: E501 + :param language: The language of this DatabaseDto. # noqa: E501 :type: str """ allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"] # noqa: E501 - if database_language not in allowed_values: + if language not in allowed_values: raise ValueError( - "Invalid value for `database_language` ({0}), must be one of {1}" # noqa: E501 - .format(database_language, allowed_values) + "Invalid value for `language` ({0}), must be one of {1}" # noqa: E501 + .format(language, allowed_values) ) - self._database_language = database_language + self._language = language @property - def database_license(self): - """Gets the database_license of this DatabaseDto. # noqa: E501 + def license(self): + """Gets the license of this DatabaseDto. # noqa: E501 - :return: The database_license of this DatabaseDto. # noqa: E501 + :return: The license of this DatabaseDto. # noqa: E501 :rtype: LicenseDto """ - return self._database_license + return self._license - @database_license.setter - def database_license(self, database_license): - """Sets the database_license of this DatabaseDto. + @license.setter + def license(self, license): + """Sets the license of this DatabaseDto. - :param database_license: The database_license of this DatabaseDto. # noqa: E501 + :param license: The license of this DatabaseDto. # noqa: E501 :type: LicenseDto """ - self._database_license = database_license + self._license = license @property - def database_description(self): - """Gets the database_description of this DatabaseDto. # noqa: E501 + def description(self): + """Gets the description of this DatabaseDto. # noqa: E501 - :return: The database_description of this DatabaseDto. # noqa: E501 + :return: The description of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_description + return self._description - @database_description.setter - def database_description(self, database_description): - """Sets the database_description of this DatabaseDto. + @description.setter + def description(self, description): + """Sets the description of this DatabaseDto. - :param database_description: The database_description of this DatabaseDto. # noqa: E501 + :param description: The description of this DatabaseDto. # noqa: E501 :type: str """ - if database_description is None: - raise ValueError("Invalid value for `database_description`, must not be `None`") # noqa: E501 - self._database_description = database_description + self._description = description @property - def database_publisher(self): - """Gets the database_publisher of this DatabaseDto. # noqa: E501 + def publisher(self): + """Gets the publisher of this DatabaseDto. # noqa: E501 - :return: The database_publisher of this DatabaseDto. # noqa: E501 + :return: The publisher of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_publisher + return self._publisher - @database_publisher.setter - def database_publisher(self, database_publisher): - """Sets the database_publisher of this DatabaseDto. + @publisher.setter + def publisher(self, publisher): + """Sets the publisher of this DatabaseDto. - :param database_publisher: The database_publisher of this DatabaseDto. # noqa: E501 + :param publisher: The publisher of this DatabaseDto. # noqa: E501 :type: str """ - self._database_publisher = database_publisher + self._publisher = publisher @property - def database_contact_person(self): - """Gets the database_contact_person of this DatabaseDto. # noqa: E501 + def contact(self): + """Gets the contact of this DatabaseDto. # noqa: E501 - :return: The database_contact_person of this DatabaseDto. # noqa: E501 + :return: The contact of this DatabaseDto. # noqa: E501 :rtype: UserDto """ - return self._database_contact_person + return self._contact - @database_contact_person.setter - def database_contact_person(self, database_contact_person): - """Sets the database_contact_person of this DatabaseDto. + @contact.setter + def contact(self, contact): + """Sets the contact of this DatabaseDto. - :param database_contact_person: The database_contact_person of this DatabaseDto. # noqa: E501 + :param contact: The contact of this DatabaseDto. # noqa: E501 :type: UserDto """ - self._database_contact_person = database_contact_person + self._contact = contact @property def tables(self): @@ -379,25 +380,25 @@ class DatabaseDto(object): self._tables = tables @property - def database_container_image(self): - """Gets the database_container_image of this DatabaseDto. # noqa: E501 + def image(self): + """Gets the image of this DatabaseDto. # noqa: E501 - :return: The database_container_image of this DatabaseDto. # noqa: E501 + :return: The image of this DatabaseDto. # noqa: E501 :rtype: ImageDto """ - return self._database_container_image + return self._image - @database_container_image.setter - def database_container_image(self, database_container_image): - """Sets the database_container_image of this DatabaseDto. + @image.setter + def image(self, image): + """Sets the image of this DatabaseDto. - :param database_container_image: The database_container_image of this DatabaseDto. # noqa: E501 + :param image: The image of this DatabaseDto. # noqa: E501 :type: ImageDto """ - self._database_container_image = database_container_image + self._image = image @property def container(self): @@ -421,25 +422,25 @@ class DatabaseDto(object): self._container = container @property - def database_creation_time(self): - """Gets the database_creation_time of this DatabaseDto. # noqa: E501 + def created(self): + """Gets the created of this DatabaseDto. # noqa: E501 - :return: The database_creation_time of this DatabaseDto. # noqa: E501 + :return: The created of this DatabaseDto. # noqa: E501 :rtype: datetime """ - return self._database_creation_time + return self._created - @database_creation_time.setter - def database_creation_time(self, database_creation_time): - """Sets the database_creation_time of this DatabaseDto. + @created.setter + def created(self, created): + """Sets the created of this DatabaseDto. - :param database_creation_time: The database_creation_time of this DatabaseDto. # noqa: E501 + :param created: The created of this DatabaseDto. # noqa: E501 :type: datetime """ - self._database_creation_time = database_creation_time + self._created = created @property def deleted(self): @@ -463,111 +464,119 @@ class DatabaseDto(object): self._deleted = deleted @property - def database_internal_name(self): - """Gets the database_internal_name of this DatabaseDto. # noqa: E501 + def internal_name(self): + """Gets the internal_name of this DatabaseDto. # noqa: E501 - :return: The database_internal_name of this DatabaseDto. # noqa: E501 + :return: The internal_name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_internal_name + return self._internal_name - @database_internal_name.setter - def database_internal_name(self, database_internal_name): - """Sets the database_internal_name of this DatabaseDto. + @internal_name.setter + def internal_name(self, internal_name): + """Sets the internal_name of this DatabaseDto. - :param database_internal_name: The database_internal_name of this DatabaseDto. # noqa: E501 + :param internal_name: The internal_name of this DatabaseDto. # noqa: E501 :type: str """ - if database_internal_name is None: - raise ValueError("Invalid value for `database_internal_name`, must not be `None`") # noqa: E501 + if internal_name is None: + raise ValueError("Invalid value for `internal_name`, must not be `None`") # noqa: E501 - self._database_internal_name = database_internal_name + self._internal_name = internal_name @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseDto. # noqa: E501 + :return: The publication_year of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property - def database_publication_month(self): - """Gets the database_publication_month of this DatabaseDto. # noqa: E501 + def publication_month(self): + """Gets the publication_month of this DatabaseDto. # noqa: E501 + database publication month # noqa: E501 - :return: The database_publication_month of this DatabaseDto. # noqa: E501 + :return: The publication_month of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_month + return self._publication_month - @database_publication_month.setter - def database_publication_month(self, database_publication_month): - """Sets the database_publication_month of this DatabaseDto. + @publication_month.setter + def publication_month(self, publication_month): + """Sets the publication_month of this DatabaseDto. + database publication month # noqa: E501 - :param database_publication_month: The database_publication_month of this DatabaseDto. # noqa: E501 + :param publication_month: The publication_month of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_month = database_publication_month + self._publication_month = publication_month @property - def database_publication_day(self): - """Gets the database_publication_day of this DatabaseDto. # noqa: E501 + def publication_day(self): + """Gets the publication_day of this DatabaseDto. # noqa: E501 + database publication day # noqa: E501 - :return: The database_publication_day of this DatabaseDto. # noqa: E501 + :return: The publication_day of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_day + return self._publication_day - @database_publication_day.setter - def database_publication_day(self, database_publication_day): - """Sets the database_publication_day of this DatabaseDto. + @publication_day.setter + def publication_day(self, publication_day): + """Sets the publication_day of this DatabaseDto. + database publication day # noqa: E501 - :param database_publication_day: The database_publication_day of this DatabaseDto. # noqa: E501 + :param publication_day: The publication_day of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_day = database_publication_day + self._publication_day = publication_day @property - def database_public(self): - """Gets the database_public of this DatabaseDto. # noqa: E501 + def is_public(self): + """Gets the is_public of this DatabaseDto. # noqa: E501 + database publicity # noqa: E501 - :return: The database_public of this DatabaseDto. # noqa: E501 + :return: The is_public of this DatabaseDto. # noqa: E501 :rtype: bool """ - return self._database_public + return self._is_public - @database_public.setter - def database_public(self, database_public): - """Sets the database_public of this DatabaseDto. + @is_public.setter + def is_public(self, is_public): + """Sets the is_public of this DatabaseDto. + database publicity # noqa: E501 - :param database_public: The database_public of this DatabaseDto. # noqa: E501 + :param is_public: The is_public of this DatabaseDto. # noqa: E501 :type: bool """ - self._database_public = database_public + self._is_public = is_public def to_dict(self): """Returns the model properties as a dict""" diff --git a/swagger/api-database/swagger_client/models/database_modify_dto.py b/swagger/api-database/swagger_client/models/database_modify_dto.py index 1e74ccca7b8e024459bd90b76f71f87724fc23c4..b860ef440549e8c66f0ff47985d3ab6a978d9f40 100644 --- a/swagger/api-database/swagger_client/models/database_modify_dto.py +++ b/swagger/api-database/swagger_client/models/database_modify_dto.py @@ -33,7 +33,7 @@ class DatabaseModifyDto(object): 'publisher': 'str', 'license': 'LicenseDto', 'language': 'str', - 'database_publication_year': 'int', + 'publication_year': 'int', 'publication_month': 'int', 'publication_day': 'int', 'contact_person': 'str' @@ -45,20 +45,20 @@ class DatabaseModifyDto(object): 'publisher': 'publisher', 'license': 'license', 'language': 'language', - 'database_publication_year': 'database publication year', + 'publication_year': 'publication_year', 'publication_month': 'publication_month', 'publication_day': 'publication_day', 'contact_person': 'contact_person' } - def __init__(self, subjects=None, description=None, publisher=None, license=None, language=None, database_publication_year=None, publication_month=None, publication_day=None, contact_person=None): # noqa: E501 + def __init__(self, subjects=None, description=None, publisher=None, license=None, language=None, publication_year=None, publication_month=None, publication_day=None, contact_person=None): # noqa: E501 """DatabaseModifyDto - a model defined in Swagger""" # noqa: E501 self._subjects = None self._description = None self._publisher = None self._license = None self._language = None - self._database_publication_year = None + self._publication_year = None self._publication_month = None self._publication_day = None self._contact_person = None @@ -72,7 +72,7 @@ class DatabaseModifyDto(object): self.license = license if language is not None: self.language = language - self.database_publication_year = database_publication_year + self.publication_year = publication_year if publication_month is not None: self.publication_month = publication_month if publication_day is not None: @@ -194,32 +194,35 @@ class DatabaseModifyDto(object): self._language = language @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseModifyDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseModifyDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseModifyDto. # noqa: E501 + :return: The publication_year of this DatabaseModifyDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseModifyDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseModifyDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseModifyDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseModifyDto. # noqa: E501 :type: int """ - if database_publication_year is None: - raise ValueError("Invalid value for `database_publication_year`, must not be `None`") # noqa: E501 + if publication_year is None: + raise ValueError("Invalid value for `publication_year`, must not be `None`") # noqa: E501 - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property def publication_month(self): """Gets the publication_month of this DatabaseModifyDto. # noqa: E501 + database publication month # noqa: E501 :return: The publication_month of this DatabaseModifyDto. # noqa: E501 :rtype: int @@ -230,6 +233,7 @@ class DatabaseModifyDto(object): def publication_month(self, publication_month): """Sets the publication_month of this DatabaseModifyDto. + database publication month # noqa: E501 :param publication_month: The publication_month of this DatabaseModifyDto. # noqa: E501 :type: int @@ -241,6 +245,7 @@ class DatabaseModifyDto(object): def publication_day(self): """Gets the publication_day of this DatabaseModifyDto. # noqa: E501 + database publication day # noqa: E501 :return: The publication_day of this DatabaseModifyDto. # noqa: E501 :rtype: int @@ -251,6 +256,7 @@ class DatabaseModifyDto(object): def publication_day(self, publication_day): """Sets the publication_day of this DatabaseModifyDto. + database publication day # noqa: E501 :param publication_day: The publication_day of this DatabaseModifyDto. # noqa: E501 :type: int diff --git a/swagger/api-database/swagger_client/models/image_env_item_dto.py b/swagger/api-database/swagger_client/models/image_env_item_dto.py index 21f24fc6b259b257ab6963b6b24b3c686cefccef..731f28ed827093c1414b766d4d07007f05ea67da 100644 --- a/swagger/api-database/swagger_client/models/image_env_item_dto.py +++ b/swagger/api-database/swagger_client/models/image_env_item_dto.py @@ -51,8 +51,7 @@ class ImageEnvItemDto(object): self.iid = iid self.key = key self.value = value - if type is not None: - self.type = type + self.type = type @property def iid(self): @@ -141,7 +140,9 @@ class ImageEnvItemDto(object): :param type: The type of this ImageEnvItemDto. # noqa: E501 :type: str """ - allowed_values = ["USERNAME", "PASSWORD", "PRIVILEGED_USERNAME", "PRIVILEGED_PASSWORD"] # noqa: E501 + if type is None: + raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501 + allowed_values = ["username", "password", "privileged_username", "privileged_password"] # noqa: E501 if type not in allowed_values: raise ValueError( "Invalid value for `type` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-database/swagger_client/models/user_brief_dto.py b/swagger/api-database/swagger_client/models/user_brief_dto.py index 3987d84a78d9fe15760e4e59a7bade18f8b210dc..8803ecc7bd620090e37f9ede772206c9e2d9b35c 100644 --- a/swagger/api-database/swagger_client/models/user_brief_dto.py +++ b/swagger/api-database/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/api-database/swagger_client/models/user_dto.py b/swagger/api-database/swagger_client/models/user_dto.py index fef246bbae7e509d86e14142176a3fb235fa5d89..46206a4a60b0d254b5f407d9a758a1ca87199bb0 100644 --- a/swagger/api-database/swagger_client/models/user_dto.py +++ b/swagger/api-database/swagger_client/models/user_dto.py @@ -155,6 +155,7 @@ class UserDto(object): def username(self): """Gets the username of this UserDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserDto. # noqa: E501 :rtype: str @@ -165,6 +166,7 @@ class UserDto(object): def username(self, username): """Sets the username of this UserDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserDto. # noqa: E501 :type: str diff --git a/swagger/api-database/test/test_database_endpoint_api.py b/swagger/api-database/test/test_database_endpoint_api.py new file mode 100644 index 0000000000000000000000000000000000000000..e28087e37ec635bfea9b923d52cf4342355874ea --- /dev/null +++ b/swagger/api-database/test/test_database_endpoint_api.py @@ -0,0 +1,75 @@ +# coding: utf-8 + +""" + Database Repository Database Service API + + Service that manages the databases # noqa: E501 + + OpenAPI spec version: 1.1.0-alpha + Contact: andreas.rauber@tuwien.ac.at + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +from __future__ import absolute_import + +import unittest + +import swagger_client +from swagger_client.api.database_endpoint_api import DatabaseEndpointApi # noqa: E501 +from swagger_client.rest import ApiException + + +class TestDatabaseEndpointApi(unittest.TestCase): + """DatabaseEndpointApi unit test stubs""" + + def setUp(self): + self.api = DatabaseEndpointApi() # noqa: E501 + + def tearDown(self): + pass + + def test_create(self): + """Test case for create + + Create database # noqa: E501 + """ + pass + + def test_delete1(self): + """Test case for delete1 + + Delete some database # noqa: E501 + """ + pass + + def test_find_all(self): + """Test case for find_all + + List databases # noqa: E501 + """ + pass + + def test_find_by_id(self): + """Test case for find_by_id + + Find some database # noqa: E501 + """ + pass + + def test_transfer(self): + """Test case for transfer + + Update database # noqa: E501 + """ + pass + + def test_update(self): + """Test case for update + + Update database # noqa: E501 + """ + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/swagger/api-identifier.yaml b/swagger/api-identifier.yaml index de19fe4c870048bd6153c3e5bbcfa94ae85a4ce9..0d1f8249b659fa01114423b8565911521572fd7e 100644 --- a/swagger/api-identifier.yaml +++ b/swagger/api-identifier.yaml @@ -405,6 +405,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -476,8 +477,10 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound ContainerDto: required: - created @@ -492,17 +495,20 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality state: type: string + example: running enum: - - ContainerStateDto.CREATED - - ContainerStateDto.RESTARTING - - ContainerStateDto.RUNNING - - ContainerStateDto.PAUSED - - ContainerStateDto.EXITED - - ContainerStateDto.DEAD + - created + - restarting + - running + - paused + - exited + - dead databases: type: array items: @@ -515,8 +521,10 @@ components: created: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z internal_name: type: string + example: air-quality ip_address: type: string CreatorDto: @@ -531,10 +539,13 @@ components: format: int64 name: type: string + example: "Carberry, Josiah" affiliation: type: string + example: Wesleyan University orcid: type: string + example: 0000-0002-1825-0097 created: type: string format: date-time @@ -543,32 +554,33 @@ components: format: date-time DatabaseDto: required: - - database creator - - database description - - database exchange - - database id - - database internal name - - database name + - creator + - exchange + - id + - internal_name + - name type: object properties: - database id: + id: type: integer format: int64 - example: 1 - database name: + name: type: string - example: Weather Australia - database exchange: + example: Air Quality + exchange: type: string - database creator: + example: air_quality + creator: $ref: '#/components/schemas/UserBriefDto' - database subjects: + subjects: type: array + description: database subjects items: type: string - database language: + description: database subjects + language: type: string - example: EN + example: en enum: - ab - aa @@ -754,49 +766,58 @@ components: - yo - za - zu - database license: + license: $ref: '#/components/schemas/LicenseDto' - database description: + description: type: string - example: Weather Australia 2009-2021 - database publisher: + example: Air Quality in Austria + publisher: type: string example: TU Wien - database contact person: + contact: $ref: '#/components/schemas/UserDto' tables: type: array items: $ref: '#/components/schemas/TableBriefDto' - database container image: + image: $ref: '#/components/schemas/ImageDto' container: $ref: '#/components/schemas/ContainerDto' - database creation time: + created: type: string format: date-time deleted: type: string format: date-time - database internal name: + internal_name: type: string - example: weather_australia - database publication year: + example: air_quality + publication_year: type: integer + description: database publication year format: int32 - database publication month: + example: 2022 + publication_month: type: integer + description: database publication month format: int32 - database publication day: + example: 12 + publication_day: type: integer + description: database publication day format: int32 - database public: + example: 15 + is_public: type: boolean + description: database publicity + example: true GrantedAuthorityDto: type: object properties: authority: type: string + example: ROLE_RESEARCHER IdentifierDto: required: - cid @@ -830,23 +851,27 @@ components: format: int64 title: type: string + example: "Airquality Stephansplatz, Vienna, Austria" description: type: string + example: "Air quality reports at Stephansplatz, Vienna" query: type: string + example: "SELECT `id`, `value`, `location` FROM `air_quality` WHERE `location`\ + \ = \"09:STEF\"" execution: type: string format: date-time visibility: type: string + example: everyone enum: - everyone - trusted - self doi: type: string - publisher: - type: string + example: 10.1038/nphys1170 creator: $ref: '#/components/schemas/UserDto' creators: @@ -858,6 +883,8 @@ components: format: date-time query_normalized: type: string + example: "SELECT `id`, `value`, `location` FROM `air_quality` WHERE `location`\ + \ = \"09:STEF\"" related: type: array items: @@ -869,15 +896,19 @@ components: result_number: type: integer format: int64 + example: 1 publication_day: type: integer format: int32 + example: 15 publication_month: type: integer format: int32 + example: 12 publication_year: type: integer format: int32 + example: 2022 last_modified: type: string format: date-time @@ -893,8 +924,10 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" ImageDateDto: required: - database_format @@ -909,12 +942,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -935,36 +972,46 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" dialect: type: string + example: org.hibernate.dialect.MariaDBDialect hash: type: string + example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e compiled: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z size: type: integer + example: 314295447 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' driver_class: type: string + example: org.mariadb.jdbc.Driver date_formats: type: array items: $ref: '#/components/schemas/ImageDateDto' jdbc_method: type: string + example: mariadb default_port: type: integer format: int32 + example: 3306 ImageEnvItemDto: required: - iid - key + - type - value type: object properties: @@ -973,15 +1020,18 @@ components: format: int64 key: type: string + example: MARIADB_ROOT_PASSWORD value: type: string + example: mariadb type: type: string + example: PRIVILEGED_PASSWORD enum: - - USERNAME - - PASSWORD - - PRIVILEGED_USERNAME - - PRIVILEGED_PASSWORD + - username + - password + - privileged_username + - privileged_password LicenseDto: required: - identifier @@ -990,9 +1040,10 @@ components: properties: identifier: type: string + example: MIT uri: type: string - example: MIT2 + example: https://opensource.org/licenses/MIT RelatedIdentifierDto: required: - created @@ -1005,8 +1056,10 @@ components: format: int64 value: type: string + example: 10.70124/dc4zh-9ce78 type: type: string + example: DOI enum: - DOI - URL @@ -1028,6 +1081,7 @@ components: - w3id relation: type: string + example: Cites enum: - IsCitedBy - Cites @@ -1085,10 +1139,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserBriefDto: required: - email_verified @@ -1102,22 +1158,31 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true UserDto: required: - email @@ -1136,14 +1201,20 @@ components: $ref: '#/components/schemas/GrantedAuthorityDto' username: type: string + description: Only contains lowercase characters + example: jcarberry firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 containers: type: array items: @@ -1158,14 +1229,18 @@ components: $ref: '#/components/schemas/ContainerDto' email: type: string + example: jcarberry@brown.edu titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true CreatorCreateDto: required: - name @@ -1173,10 +1248,13 @@ components: properties: name: type: string + example: "Carberry, Josiah" affiliation: type: string + example: Wesleyan University orcid: type: string + example: 0000-0002-1825-0097 IdentifierCreateDto: required: - creators @@ -1192,18 +1270,20 @@ components: format: int64 title: type: string + example: "Airquality Stephansplatz, Vienna, Austria" description: type: string + example: "Air quality reports at Stephansplatz, Vienna" visibility: type: string + example: everyone enum: - everyone - trusted - self doi: type: string - publisher: - type: string + example: 10.1038/nphys1170 creators: type: array items: @@ -1211,12 +1291,15 @@ components: publication_day: type: integer format: int32 + example: 15 publication_month: type: integer format: int32 + example: 12 publication_year: type: integer format: int32 + example: 2022 related_identifiers: type: array items: @@ -1228,8 +1311,10 @@ components: properties: value: type: string + example: 10.70124/dc4zh-9ce78 type: type: string + example: DOI enum: - DOI - URL @@ -1251,6 +1336,7 @@ components: - w3id relation: type: string + example: Cites enum: - IsCitedBy - Cites diff --git a/swagger/api-identifier/swagger_client/models/container_dto.py b/swagger/api-identifier/swagger_client/models/container_dto.py index 85170cb23b4595f14479e05b7583587594712e6d..693e708bb79270f8205e19a3d28bdff9960c24eb 100644 --- a/swagger/api-identifier/swagger_client/models/container_dto.py +++ b/swagger/api-identifier/swagger_client/models/container_dto.py @@ -169,7 +169,7 @@ class ContainerDto(object): :param state: The state of this ContainerDto. # noqa: E501 :type: str """ - allowed_values = ["ContainerStateDto.CREATED", "ContainerStateDto.RESTARTING", "ContainerStateDto.RUNNING", "ContainerStateDto.PAUSED", "ContainerStateDto.EXITED", "ContainerStateDto.DEAD"] # noqa: E501 + allowed_values = ["created", "restarting", "running", "paused", "exited", "dead"] # noqa: E501 if state not in allowed_values: raise ValueError( "Invalid value for `state` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-identifier/swagger_client/models/database_dto.py b/swagger/api-identifier/swagger_client/models/database_dto.py index 871e9b409172c3bef32a4a93367d0df5579f3fed..ec76a65948ec69e74be06f0f8461d18b699eeb0c 100644 --- a/swagger/api-identifier/swagger_client/models/database_dto.py +++ b/swagger/api-identifier/swagger_client/models/database_dto.py @@ -28,334 +28,335 @@ class DatabaseDto(object): and the value is json key in definition. """ swagger_types = { - 'database_id': 'int', - 'database_name': 'str', - 'database_exchange': 'str', - 'database_creator': 'UserBriefDto', - 'database_subjects': 'list[str]', - 'database_language': 'str', - 'database_license': 'LicenseDto', - 'database_description': 'str', - 'database_publisher': 'str', - 'database_contact_person': 'UserDto', + 'id': 'int', + 'name': 'str', + 'exchange': 'str', + 'creator': 'UserBriefDto', + 'subjects': 'list[str]', + 'language': 'str', + 'license': 'LicenseDto', + 'description': 'str', + 'publisher': 'str', + 'contact': 'UserDto', 'tables': 'list[TableBriefDto]', - 'database_container_image': 'ImageDto', + 'image': 'ImageDto', 'container': 'ContainerDto', - 'database_creation_time': 'datetime', + 'created': 'datetime', 'deleted': 'datetime', - 'database_internal_name': 'str', - 'database_publication_year': 'int', - 'database_publication_month': 'int', - 'database_publication_day': 'int', - 'database_public': 'bool' + 'internal_name': 'str', + 'publication_year': 'int', + 'publication_month': 'int', + 'publication_day': 'int', + 'is_public': 'bool' } attribute_map = { - 'database_id': 'database id', - 'database_name': 'database name', - 'database_exchange': 'database exchange', - 'database_creator': 'database creator', - 'database_subjects': 'database subjects', - 'database_language': 'database language', - 'database_license': 'database license', - 'database_description': 'database description', - 'database_publisher': 'database publisher', - 'database_contact_person': 'database contact person', + 'id': 'id', + 'name': 'name', + 'exchange': 'exchange', + 'creator': 'creator', + 'subjects': 'subjects', + 'language': 'language', + 'license': 'license', + 'description': 'description', + 'publisher': 'publisher', + 'contact': 'contact', 'tables': 'tables', - 'database_container_image': 'database container image', + 'image': 'image', 'container': 'container', - 'database_creation_time': 'database creation time', + 'created': 'created', 'deleted': 'deleted', - 'database_internal_name': 'database internal name', - 'database_publication_year': 'database publication year', - 'database_publication_month': 'database publication month', - 'database_publication_day': 'database publication day', - 'database_public': 'database public' + 'internal_name': 'internal_name', + 'publication_year': 'publication_year', + 'publication_month': 'publication_month', + 'publication_day': 'publication_day', + 'is_public': 'is_public' } - def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None): # noqa: E501 + def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None): # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501 - self._database_id = None - self._database_name = None - self._database_exchange = None - self._database_creator = None - self._database_subjects = None - self._database_language = None - self._database_license = None - self._database_description = None - self._database_publisher = None - self._database_contact_person = None + self._id = None + self._name = None + self._exchange = None + self._creator = None + self._subjects = None + self._language = None + self._license = None + self._description = None + self._publisher = None + self._contact = None self._tables = None - self._database_container_image = None + self._image = None self._container = None - self._database_creation_time = None + self._created = None self._deleted = None - self._database_internal_name = None - self._database_publication_year = None - self._database_publication_month = None - self._database_publication_day = None - self._database_public = None + self._internal_name = None + self._publication_year = None + self._publication_month = None + self._publication_day = None + self._is_public = None self.discriminator = None - self.database_id = database_id - self.database_name = database_name - self.database_exchange = database_exchange - self.database_creator = database_creator - if database_subjects is not None: - self.database_subjects = database_subjects - if database_language is not None: - self.database_language = database_language - if database_license is not None: - self.database_license = database_license - self.database_description = database_description - if database_publisher is not None: - self.database_publisher = database_publisher - if database_contact_person is not None: - self.database_contact_person = database_contact_person + self.id = id + self.name = name + self.exchange = exchange + self.creator = creator + if subjects is not None: + self.subjects = subjects + if language is not None: + self.language = language + if license is not None: + self.license = license + if description is not None: + self.description = description + if publisher is not None: + self.publisher = publisher + if contact is not None: + self.contact = contact if tables is not None: self.tables = tables - if database_container_image is not None: - self.database_container_image = database_container_image + if image is not None: + self.image = image if container is not None: self.container = container - if database_creation_time is not None: - self.database_creation_time = database_creation_time + if created is not None: + self.created = created if deleted is not None: self.deleted = deleted - self.database_internal_name = database_internal_name - if database_publication_year is not None: - self.database_publication_year = database_publication_year - if database_publication_month is not None: - self.database_publication_month = database_publication_month - if database_publication_day is not None: - self.database_publication_day = database_publication_day - if database_public is not None: - self.database_public = database_public + self.internal_name = internal_name + if publication_year is not None: + self.publication_year = publication_year + if publication_month is not None: + self.publication_month = publication_month + if publication_day is not None: + self.publication_day = publication_day + if is_public is not None: + self.is_public = is_public @property - def database_id(self): - """Gets the database_id of this DatabaseDto. # noqa: E501 + def id(self): + """Gets the id of this DatabaseDto. # noqa: E501 - :return: The database_id of this DatabaseDto. # noqa: E501 + :return: The id of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_id + return self._id - @database_id.setter - def database_id(self, database_id): - """Sets the database_id of this DatabaseDto. + @id.setter + def id(self, id): + """Sets the id of this DatabaseDto. - :param database_id: The database_id of this DatabaseDto. # noqa: E501 + :param id: The id of this DatabaseDto. # noqa: E501 :type: int """ - if database_id is None: - raise ValueError("Invalid value for `database_id`, must not be `None`") # noqa: E501 + if id is None: + raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501 - self._database_id = database_id + self._id = id @property - def database_name(self): - """Gets the database_name of this DatabaseDto. # noqa: E501 + def name(self): + """Gets the name of this DatabaseDto. # noqa: E501 - :return: The database_name of this DatabaseDto. # noqa: E501 + :return: The name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_name + return self._name - @database_name.setter - def database_name(self, database_name): - """Sets the database_name of this DatabaseDto. + @name.setter + def name(self, name): + """Sets the name of this DatabaseDto. - :param database_name: The database_name of this DatabaseDto. # noqa: E501 + :param name: The name of this DatabaseDto. # noqa: E501 :type: str """ - if database_name is None: - raise ValueError("Invalid value for `database_name`, must not be `None`") # noqa: E501 + if name is None: + raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 - self._database_name = database_name + self._name = name @property - def database_exchange(self): - """Gets the database_exchange of this DatabaseDto. # noqa: E501 + def exchange(self): + """Gets the exchange of this DatabaseDto. # noqa: E501 - :return: The database_exchange of this DatabaseDto. # noqa: E501 + :return: The exchange of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_exchange + return self._exchange - @database_exchange.setter - def database_exchange(self, database_exchange): - """Sets the database_exchange of this DatabaseDto. + @exchange.setter + def exchange(self, exchange): + """Sets the exchange of this DatabaseDto. - :param database_exchange: The database_exchange of this DatabaseDto. # noqa: E501 + :param exchange: The exchange of this DatabaseDto. # noqa: E501 :type: str """ - if database_exchange is None: - raise ValueError("Invalid value for `database_exchange`, must not be `None`") # noqa: E501 + if exchange is None: + raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501 - self._database_exchange = database_exchange + self._exchange = exchange @property - def database_creator(self): - """Gets the database_creator of this DatabaseDto. # noqa: E501 + def creator(self): + """Gets the creator of this DatabaseDto. # noqa: E501 - :return: The database_creator of this DatabaseDto. # noqa: E501 + :return: The creator of this DatabaseDto. # noqa: E501 :rtype: UserBriefDto """ - return self._database_creator + return self._creator - @database_creator.setter - def database_creator(self, database_creator): - """Sets the database_creator of this DatabaseDto. + @creator.setter + def creator(self, creator): + """Sets the creator of this DatabaseDto. - :param database_creator: The database_creator of this DatabaseDto. # noqa: E501 + :param creator: The creator of this DatabaseDto. # noqa: E501 :type: UserBriefDto """ - if database_creator is None: - raise ValueError("Invalid value for `database_creator`, must not be `None`") # noqa: E501 + if creator is None: + raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 - self._database_creator = database_creator + self._creator = creator @property - def database_subjects(self): - """Gets the database_subjects of this DatabaseDto. # noqa: E501 + def subjects(self): + """Gets the subjects of this DatabaseDto. # noqa: E501 + database subjects # noqa: E501 - :return: The database_subjects of this DatabaseDto. # noqa: E501 + :return: The subjects of this DatabaseDto. # noqa: E501 :rtype: list[str] """ - return self._database_subjects + return self._subjects - @database_subjects.setter - def database_subjects(self, database_subjects): - """Sets the database_subjects of this DatabaseDto. + @subjects.setter + def subjects(self, subjects): + """Sets the subjects of this DatabaseDto. + database subjects # noqa: E501 - :param database_subjects: The database_subjects of this DatabaseDto. # noqa: E501 + :param subjects: The subjects of this DatabaseDto. # noqa: E501 :type: list[str] """ - self._database_subjects = database_subjects + self._subjects = subjects @property - def database_language(self): - """Gets the database_language of this DatabaseDto. # noqa: E501 + def language(self): + """Gets the language of this DatabaseDto. # noqa: E501 - :return: The database_language of this DatabaseDto. # noqa: E501 + :return: The language of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_language + return self._language - @database_language.setter - def database_language(self, database_language): - """Sets the database_language of this DatabaseDto. + @language.setter + def language(self, language): + """Sets the language of this DatabaseDto. - :param database_language: The database_language of this DatabaseDto. # noqa: E501 + :param language: The language of this DatabaseDto. # noqa: E501 :type: str """ allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"] # noqa: E501 - if database_language not in allowed_values: + if language not in allowed_values: raise ValueError( - "Invalid value for `database_language` ({0}), must be one of {1}" # noqa: E501 - .format(database_language, allowed_values) + "Invalid value for `language` ({0}), must be one of {1}" # noqa: E501 + .format(language, allowed_values) ) - self._database_language = database_language + self._language = language @property - def database_license(self): - """Gets the database_license of this DatabaseDto. # noqa: E501 + def license(self): + """Gets the license of this DatabaseDto. # noqa: E501 - :return: The database_license of this DatabaseDto. # noqa: E501 + :return: The license of this DatabaseDto. # noqa: E501 :rtype: LicenseDto """ - return self._database_license + return self._license - @database_license.setter - def database_license(self, database_license): - """Sets the database_license of this DatabaseDto. + @license.setter + def license(self, license): + """Sets the license of this DatabaseDto. - :param database_license: The database_license of this DatabaseDto. # noqa: E501 + :param license: The license of this DatabaseDto. # noqa: E501 :type: LicenseDto """ - self._database_license = database_license + self._license = license @property - def database_description(self): - """Gets the database_description of this DatabaseDto. # noqa: E501 + def description(self): + """Gets the description of this DatabaseDto. # noqa: E501 - :return: The database_description of this DatabaseDto. # noqa: E501 + :return: The description of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_description + return self._description - @database_description.setter - def database_description(self, database_description): - """Sets the database_description of this DatabaseDto. + @description.setter + def description(self, description): + """Sets the description of this DatabaseDto. - :param database_description: The database_description of this DatabaseDto. # noqa: E501 + :param description: The description of this DatabaseDto. # noqa: E501 :type: str """ - if database_description is None: - raise ValueError("Invalid value for `database_description`, must not be `None`") # noqa: E501 - self._database_description = database_description + self._description = description @property - def database_publisher(self): - """Gets the database_publisher of this DatabaseDto. # noqa: E501 + def publisher(self): + """Gets the publisher of this DatabaseDto. # noqa: E501 - :return: The database_publisher of this DatabaseDto. # noqa: E501 + :return: The publisher of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_publisher + return self._publisher - @database_publisher.setter - def database_publisher(self, database_publisher): - """Sets the database_publisher of this DatabaseDto. + @publisher.setter + def publisher(self, publisher): + """Sets the publisher of this DatabaseDto. - :param database_publisher: The database_publisher of this DatabaseDto. # noqa: E501 + :param publisher: The publisher of this DatabaseDto. # noqa: E501 :type: str """ - self._database_publisher = database_publisher + self._publisher = publisher @property - def database_contact_person(self): - """Gets the database_contact_person of this DatabaseDto. # noqa: E501 + def contact(self): + """Gets the contact of this DatabaseDto. # noqa: E501 - :return: The database_contact_person of this DatabaseDto. # noqa: E501 + :return: The contact of this DatabaseDto. # noqa: E501 :rtype: UserDto """ - return self._database_contact_person + return self._contact - @database_contact_person.setter - def database_contact_person(self, database_contact_person): - """Sets the database_contact_person of this DatabaseDto. + @contact.setter + def contact(self, contact): + """Sets the contact of this DatabaseDto. - :param database_contact_person: The database_contact_person of this DatabaseDto. # noqa: E501 + :param contact: The contact of this DatabaseDto. # noqa: E501 :type: UserDto """ - self._database_contact_person = database_contact_person + self._contact = contact @property def tables(self): @@ -379,25 +380,25 @@ class DatabaseDto(object): self._tables = tables @property - def database_container_image(self): - """Gets the database_container_image of this DatabaseDto. # noqa: E501 + def image(self): + """Gets the image of this DatabaseDto. # noqa: E501 - :return: The database_container_image of this DatabaseDto. # noqa: E501 + :return: The image of this DatabaseDto. # noqa: E501 :rtype: ImageDto """ - return self._database_container_image + return self._image - @database_container_image.setter - def database_container_image(self, database_container_image): - """Sets the database_container_image of this DatabaseDto. + @image.setter + def image(self, image): + """Sets the image of this DatabaseDto. - :param database_container_image: The database_container_image of this DatabaseDto. # noqa: E501 + :param image: The image of this DatabaseDto. # noqa: E501 :type: ImageDto """ - self._database_container_image = database_container_image + self._image = image @property def container(self): @@ -421,25 +422,25 @@ class DatabaseDto(object): self._container = container @property - def database_creation_time(self): - """Gets the database_creation_time of this DatabaseDto. # noqa: E501 + def created(self): + """Gets the created of this DatabaseDto. # noqa: E501 - :return: The database_creation_time of this DatabaseDto. # noqa: E501 + :return: The created of this DatabaseDto. # noqa: E501 :rtype: datetime """ - return self._database_creation_time + return self._created - @database_creation_time.setter - def database_creation_time(self, database_creation_time): - """Sets the database_creation_time of this DatabaseDto. + @created.setter + def created(self, created): + """Sets the created of this DatabaseDto. - :param database_creation_time: The database_creation_time of this DatabaseDto. # noqa: E501 + :param created: The created of this DatabaseDto. # noqa: E501 :type: datetime """ - self._database_creation_time = database_creation_time + self._created = created @property def deleted(self): @@ -463,111 +464,119 @@ class DatabaseDto(object): self._deleted = deleted @property - def database_internal_name(self): - """Gets the database_internal_name of this DatabaseDto. # noqa: E501 + def internal_name(self): + """Gets the internal_name of this DatabaseDto. # noqa: E501 - :return: The database_internal_name of this DatabaseDto. # noqa: E501 + :return: The internal_name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_internal_name + return self._internal_name - @database_internal_name.setter - def database_internal_name(self, database_internal_name): - """Sets the database_internal_name of this DatabaseDto. + @internal_name.setter + def internal_name(self, internal_name): + """Sets the internal_name of this DatabaseDto. - :param database_internal_name: The database_internal_name of this DatabaseDto. # noqa: E501 + :param internal_name: The internal_name of this DatabaseDto. # noqa: E501 :type: str """ - if database_internal_name is None: - raise ValueError("Invalid value for `database_internal_name`, must not be `None`") # noqa: E501 + if internal_name is None: + raise ValueError("Invalid value for `internal_name`, must not be `None`") # noqa: E501 - self._database_internal_name = database_internal_name + self._internal_name = internal_name @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseDto. # noqa: E501 + :return: The publication_year of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property - def database_publication_month(self): - """Gets the database_publication_month of this DatabaseDto. # noqa: E501 + def publication_month(self): + """Gets the publication_month of this DatabaseDto. # noqa: E501 + database publication month # noqa: E501 - :return: The database_publication_month of this DatabaseDto. # noqa: E501 + :return: The publication_month of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_month + return self._publication_month - @database_publication_month.setter - def database_publication_month(self, database_publication_month): - """Sets the database_publication_month of this DatabaseDto. + @publication_month.setter + def publication_month(self, publication_month): + """Sets the publication_month of this DatabaseDto. + database publication month # noqa: E501 - :param database_publication_month: The database_publication_month of this DatabaseDto. # noqa: E501 + :param publication_month: The publication_month of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_month = database_publication_month + self._publication_month = publication_month @property - def database_publication_day(self): - """Gets the database_publication_day of this DatabaseDto. # noqa: E501 + def publication_day(self): + """Gets the publication_day of this DatabaseDto. # noqa: E501 + database publication day # noqa: E501 - :return: The database_publication_day of this DatabaseDto. # noqa: E501 + :return: The publication_day of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_day + return self._publication_day - @database_publication_day.setter - def database_publication_day(self, database_publication_day): - """Sets the database_publication_day of this DatabaseDto. + @publication_day.setter + def publication_day(self, publication_day): + """Sets the publication_day of this DatabaseDto. + database publication day # noqa: E501 - :param database_publication_day: The database_publication_day of this DatabaseDto. # noqa: E501 + :param publication_day: The publication_day of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_day = database_publication_day + self._publication_day = publication_day @property - def database_public(self): - """Gets the database_public of this DatabaseDto. # noqa: E501 + def is_public(self): + """Gets the is_public of this DatabaseDto. # noqa: E501 + database publicity # noqa: E501 - :return: The database_public of this DatabaseDto. # noqa: E501 + :return: The is_public of this DatabaseDto. # noqa: E501 :rtype: bool """ - return self._database_public + return self._is_public - @database_public.setter - def database_public(self, database_public): - """Sets the database_public of this DatabaseDto. + @is_public.setter + def is_public(self, is_public): + """Sets the is_public of this DatabaseDto. + database publicity # noqa: E501 - :param database_public: The database_public of this DatabaseDto. # noqa: E501 + :param is_public: The is_public of this DatabaseDto. # noqa: E501 :type: bool """ - self._database_public = database_public + self._is_public = is_public def to_dict(self): """Returns the model properties as a dict""" diff --git a/swagger/api-identifier/swagger_client/models/identifier_create_dto.py b/swagger/api-identifier/swagger_client/models/identifier_create_dto.py index 80c8790bdcde9549390fc471a5a7bf95228d940d..d0ac2f8bd4eafe0c4a7da50afce5cfa37ff43a73 100644 --- a/swagger/api-identifier/swagger_client/models/identifier_create_dto.py +++ b/swagger/api-identifier/swagger_client/models/identifier_create_dto.py @@ -33,7 +33,6 @@ class IdentifierCreateDto(object): 'description': 'str', 'visibility': 'str', 'doi': 'str', - 'publisher': 'str', 'creators': 'list[CreatorCreateDto]', 'publication_day': 'int', 'publication_month': 'int', @@ -47,7 +46,6 @@ class IdentifierCreateDto(object): 'description': 'description', 'visibility': 'visibility', 'doi': 'doi', - 'publisher': 'publisher', 'creators': 'creators', 'publication_day': 'publication_day', 'publication_month': 'publication_month', @@ -55,14 +53,13 @@ class IdentifierCreateDto(object): 'related_identifiers': 'related_identifiers' } - def __init__(self, qid=None, title=None, description=None, visibility=None, doi=None, publisher=None, creators=None, publication_day=None, publication_month=None, publication_year=None, related_identifiers=None): # noqa: E501 + def __init__(self, qid=None, title=None, description=None, visibility=None, doi=None, creators=None, publication_day=None, publication_month=None, publication_year=None, related_identifiers=None): # noqa: E501 """IdentifierCreateDto - a model defined in Swagger""" # noqa: E501 self._qid = None self._title = None self._description = None self._visibility = None self._doi = None - self._publisher = None self._creators = None self._publication_day = None self._publication_month = None @@ -75,8 +72,6 @@ class IdentifierCreateDto(object): self.visibility = visibility if doi is not None: self.doi = doi - if publisher is not None: - self.publisher = publisher self.creators = creators if publication_day is not None: self.publication_day = publication_day @@ -205,27 +200,6 @@ class IdentifierCreateDto(object): self._doi = doi - @property - def publisher(self): - """Gets the publisher of this IdentifierCreateDto. # noqa: E501 - - - :return: The publisher of this IdentifierCreateDto. # noqa: E501 - :rtype: str - """ - return self._publisher - - @publisher.setter - def publisher(self, publisher): - """Sets the publisher of this IdentifierCreateDto. - - - :param publisher: The publisher of this IdentifierCreateDto. # noqa: E501 - :type: str - """ - - self._publisher = publisher - @property def creators(self): """Gets the creators of this IdentifierCreateDto. # noqa: E501 diff --git a/swagger/api-identifier/swagger_client/models/identifier_dto.py b/swagger/api-identifier/swagger_client/models/identifier_dto.py index f182dd5cd6339bca64060e97416d5fd71e2b14d5..5ee9095a726672927b5099a687474f420c06c11d 100644 --- a/swagger/api-identifier/swagger_client/models/identifier_dto.py +++ b/swagger/api-identifier/swagger_client/models/identifier_dto.py @@ -38,7 +38,6 @@ class IdentifierDto(object): 'execution': 'datetime', 'visibility': 'str', 'doi': 'str', - 'publisher': 'str', 'creator': 'UserDto', 'creators': 'list[CreatorDto]', 'created': 'datetime', @@ -64,7 +63,6 @@ class IdentifierDto(object): 'execution': 'execution', 'visibility': 'visibility', 'doi': 'doi', - 'publisher': 'publisher', 'creator': 'creator', 'creators': 'creators', 'created': 'created', @@ -79,7 +77,7 @@ class IdentifierDto(object): 'last_modified': 'last_modified' } - def __init__(self, id=None, cid=None, dbid=None, qid=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, publisher=None, creator=None, creators=None, created=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication_day=None, publication_month=None, publication_year=None, last_modified=None): # noqa: E501 + def __init__(self, id=None, cid=None, dbid=None, qid=None, title=None, description=None, query=None, execution=None, visibility=None, doi=None, creator=None, creators=None, created=None, query_normalized=None, related=None, query_hash=None, result_hash=None, result_number=None, publication_day=None, publication_month=None, publication_year=None, last_modified=None): # noqa: E501 """IdentifierDto - a model defined in Swagger""" # noqa: E501 self._id = None self._cid = None @@ -91,7 +89,6 @@ class IdentifierDto(object): self._execution = None self._visibility = None self._doi = None - self._publisher = None self._creator = None self._creators = None self._created = None @@ -117,8 +114,6 @@ class IdentifierDto(object): self.visibility = visibility if doi is not None: self.doi = doi - if publisher is not None: - self.publisher = publisher self.creator = creator self.creators = creators if created is not None: @@ -369,27 +364,6 @@ class IdentifierDto(object): self._doi = doi - @property - def publisher(self): - """Gets the publisher of this IdentifierDto. # noqa: E501 - - - :return: The publisher of this IdentifierDto. # noqa: E501 - :rtype: str - """ - return self._publisher - - @publisher.setter - def publisher(self, publisher): - """Sets the publisher of this IdentifierDto. - - - :param publisher: The publisher of this IdentifierDto. # noqa: E501 - :type: str - """ - - self._publisher = publisher - @property def creator(self): """Gets the creator of this IdentifierDto. # noqa: E501 diff --git a/swagger/api-identifier/swagger_client/models/image_env_item_dto.py b/swagger/api-identifier/swagger_client/models/image_env_item_dto.py index c628feb2429398fe23d2f4b914e372e75f8446dd..d57bcd016227638defc32e968b0ccb68f157dfef 100644 --- a/swagger/api-identifier/swagger_client/models/image_env_item_dto.py +++ b/swagger/api-identifier/swagger_client/models/image_env_item_dto.py @@ -51,8 +51,7 @@ class ImageEnvItemDto(object): self.iid = iid self.key = key self.value = value - if type is not None: - self.type = type + self.type = type @property def iid(self): @@ -141,7 +140,9 @@ class ImageEnvItemDto(object): :param type: The type of this ImageEnvItemDto. # noqa: E501 :type: str """ - allowed_values = ["USERNAME", "PASSWORD", "PRIVILEGED_USERNAME", "PRIVILEGED_PASSWORD"] # noqa: E501 + if type is None: + raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501 + allowed_values = ["username", "password", "privileged_username", "privileged_password"] # noqa: E501 if type not in allowed_values: raise ValueError( "Invalid value for `type` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-identifier/swagger_client/models/user_brief_dto.py b/swagger/api-identifier/swagger_client/models/user_brief_dto.py index 40f051336a795bbbdd47abd0daba60af11ca02e1..2c331dde9093c6a77468dc93b938d670e58d267d 100644 --- a/swagger/api-identifier/swagger_client/models/user_brief_dto.py +++ b/swagger/api-identifier/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/api-identifier/swagger_client/models/user_dto.py b/swagger/api-identifier/swagger_client/models/user_dto.py index 59563bcff5f028843f2303b96231661d30bd1315..882cb85a7d297c121498fb7d8d6c38e5d0dfdca9 100644 --- a/swagger/api-identifier/swagger_client/models/user_dto.py +++ b/swagger/api-identifier/swagger_client/models/user_dto.py @@ -155,6 +155,7 @@ class UserDto(object): def username(self): """Gets the username of this UserDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserDto. # noqa: E501 :rtype: str @@ -165,6 +166,7 @@ class UserDto(object): def username(self, username): """Sets the username of this UserDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserDto. # noqa: E501 :type: str diff --git a/swagger/api-metadata.yaml b/swagger/api-metadata.yaml index f4d6b267b7bcce0548971b5082a5f68154272210..f58d3223d2a1756f06e5e588d56501581efbabbb 100644 --- a/swagger/api-metadata.yaml +++ b/swagger/api-metadata.yaml @@ -24,7 +24,10 @@ paths: operationId: identify_1_1_1_1 parameters: - name: verb - example: ListMetadataFormats + in: query + required: true + schema: + type: string - name: parameters in: query required: true @@ -52,11 +55,11 @@ components: type: string resumptionToken: type: string + parametersString: + type: string fromDate: type: string format: date-time untilDate: type: string format: date-time - parametersString: - type: string diff --git a/swagger/api-metadata/README.md b/swagger/api-metadata/README.md index ee5aa44d5c3a13d0d43b524f88bc8ccaf64b5ba9..fa1e819ace2b1594a630faebb14a054f0494c614 100644 --- a/swagger/api-metadata/README.md +++ b/swagger/api-metadata/README.md @@ -53,11 +53,12 @@ from pprint import pprint # create an instance of the API class api_instance = swagger_client.MetadataEndpointApi(swagger_client.ApiClient(configuration)) +verb = 'verb_example' # str | parameters = swagger_client.OaiListIdentifiersParameters() # OaiListIdentifiersParameters | try: # Get the record - api_response = api_instance.identify1111(parameters) + api_response = api_instance.identify1111(verb, parameters) pprint(api_response) except ApiException as e: print("Exception when calling MetadataEndpointApi->identify1111: %s\n" % e) diff --git a/swagger/api-metadata/swagger_client/api/identify_endpoint_api.py b/swagger/api-metadata/swagger_client/api/identify_endpoint_api.py new file mode 100644 index 0000000000000000000000000000000000000000..971c01bd34a65797ab9f544a874c2bcb1af40e9e --- /dev/null +++ b/swagger/api-metadata/swagger_client/api/identify_endpoint_api.py @@ -0,0 +1,134 @@ +# coding: utf-8 + +""" + Database Repository Metadata Service API + + Service that manages the metadata # noqa: E501 + + OpenAPI spec version: 1.1.0-alpha + Contact: andreas.rauber@tuwien.ac.at + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +from __future__ import absolute_import + +import re # noqa: F401 + +# python 2 and python 3 compatibility library +import six + +from swagger_client.api_client import ApiClient + + +class IdentifyEndpointApi(object): + """NOTE: This class is auto generated by the swagger code generator program. + + Do not edit the class manually. + Ref: https://github.com/swagger-api/swagger-codegen + """ + + def __init__(self, api_client=None): + if api_client is None: + api_client = ApiClient() + self.api_client = api_client + + def identify1111(self, verb, parameters, **kwargs): # noqa: E501 + """Get the record # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.identify1111(verb, parameters, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str verb: (required) + :param OaiListIdentifiersParameters parameters: (required) + :return: object + If the method is called asynchronously, + returns the request thread. + """ + kwargs['_return_http_data_only'] = True + if kwargs.get('async_req'): + return self.identify1111_with_http_info(verb, parameters, **kwargs) # noqa: E501 + else: + (data) = self.identify1111_with_http_info(verb, parameters, **kwargs) # noqa: E501 + return data + + def identify1111_with_http_info(self, verb, parameters, **kwargs): # noqa: E501 + """Get the record # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + >>> thread = api.identify1111_with_http_info(verb, parameters, async_req=True) + >>> result = thread.get() + + :param async_req bool + :param str verb: (required) + :param OaiListIdentifiersParameters parameters: (required) + :return: object + If the method is called asynchronously, + returns the request thread. + """ + + all_params = ['verb', 'parameters'] # noqa: E501 + all_params.append('async_req') + all_params.append('_return_http_data_only') + all_params.append('_preload_content') + all_params.append('_request_timeout') + + params = locals() + for key, val in six.iteritems(params['kwargs']): + if key not in all_params: + raise TypeError( + "Got an unexpected keyword argument '%s'" + " to method identify1111" % key + ) + params[key] = val + del params['kwargs'] + # verify the required parameter 'verb' is set + if ('verb' not in params or + params['verb'] is None): + raise ValueError("Missing the required parameter `verb` when calling `identify1111`") # noqa: E501 + # verify the required parameter 'parameters' is set + if ('parameters' not in params or + params['parameters'] is None): + raise ValueError("Missing the required parameter `parameters` when calling `identify1111`") # noqa: E501 + + collection_formats = {} + + path_params = {} + + query_params = [] + if 'verb' in params: + query_params.append(('verb', params['verb'])) # noqa: E501 + if 'parameters' in params: + query_params.append(('parameters', params['parameters'])) # noqa: E501 + + header_params = {} + + form_params = [] + local_var_files = {} + + body_params = None + # HTTP header `Accept` + header_params['Accept'] = self.api_client.select_header_accept( + ['text/xml;charset=UTF-8']) # noqa: E501 + + # Authentication setting + auth_settings = [] # noqa: E501 + + return self.api_client.call_api( + '/api/oai', 'GET', + path_params, + query_params, + header_params, + body=body_params, + post_params=form_params, + files=local_var_files, + response_type='object', # noqa: E501 + auth_settings=auth_settings, + async_req=params.get('async_req'), + _return_http_data_only=params.get('_return_http_data_only'), + _preload_content=params.get('_preload_content', True), + _request_timeout=params.get('_request_timeout'), + collection_formats=collection_formats) diff --git a/swagger/api-metadata/swagger_client/api/metadata_endpoint_api.py b/swagger/api-metadata/swagger_client/api/metadata_endpoint_api.py index c8c59be5faac53bc6334fc0e0bc07606f930dc90..462e80701dcd394caeb0e10f0b1f8370634373cb 100644 --- a/swagger/api-metadata/swagger_client/api/metadata_endpoint_api.py +++ b/swagger/api-metadata/swagger_client/api/metadata_endpoint_api.py @@ -32,15 +32,16 @@ class MetadataEndpointApi(object): api_client = ApiClient() self.api_client = api_client - def identify1111(self, parameters, **kwargs): # noqa: E501 + def identify1111(self, verb, parameters, **kwargs): # noqa: E501 """Get the record # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.identify1111(parameters, async_req=True) + >>> thread = api.identify1111(verb, parameters, async_req=True) >>> result = thread.get() :param async_req bool + :param str verb: (required) :param OaiListIdentifiersParameters parameters: (required) :return: object If the method is called asynchronously, @@ -48,27 +49,28 @@ class MetadataEndpointApi(object): """ kwargs['_return_http_data_only'] = True if kwargs.get('async_req'): - return self.identify1111_with_http_info(parameters, **kwargs) # noqa: E501 + return self.identify1111_with_http_info(verb, parameters, **kwargs) # noqa: E501 else: - (data) = self.identify1111_with_http_info(parameters, **kwargs) # noqa: E501 + (data) = self.identify1111_with_http_info(verb, parameters, **kwargs) # noqa: E501 return data - def identify1111_with_http_info(self, parameters, **kwargs): # noqa: E501 + def identify1111_with_http_info(self, verb, parameters, **kwargs): # noqa: E501 """Get the record # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.identify1111_with_http_info(parameters, async_req=True) + >>> thread = api.identify1111_with_http_info(verb, parameters, async_req=True) >>> result = thread.get() :param async_req bool + :param str verb: (required) :param OaiListIdentifiersParameters parameters: (required) :return: object If the method is called asynchronously, returns the request thread. """ - all_params = ['parameters'] # noqa: E501 + all_params = ['verb', 'parameters'] # noqa: E501 all_params.append('async_req') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -83,6 +85,10 @@ class MetadataEndpointApi(object): ) params[key] = val del params['kwargs'] + # verify the required parameter 'verb' is set + if ('verb' not in params or + params['verb'] is None): + raise ValueError("Missing the required parameter `verb` when calling `identify1111`") # noqa: E501 # verify the required parameter 'parameters' is set if ('parameters' not in params or params['parameters'] is None): @@ -93,6 +99,8 @@ class MetadataEndpointApi(object): path_params = {} query_params = [] + if 'verb' in params: + query_params.append(('verb', params['verb'])) # noqa: E501 if 'parameters' in params: query_params.append(('parameters', params['parameters'])) # noqa: E501 diff --git a/swagger/api-metadata/swagger_client/models/oai_list_identifiers_parameters.py b/swagger/api-metadata/swagger_client/models/oai_list_identifiers_parameters.py index 9afdd185ae784ed6a1d0b26883f43949b25da6d7..9d3169865c8f2d53e3b6afe09f14843cb36ea3ac 100644 --- a/swagger/api-metadata/swagger_client/models/oai_list_identifiers_parameters.py +++ b/swagger/api-metadata/swagger_client/models/oai_list_identifiers_parameters.py @@ -33,9 +33,9 @@ class OaiListIdentifiersParameters(object): 'until': 'str', 'set': 'str', 'resumption_token': 'str', + 'parameters_string': 'str', 'from_date': 'datetime', - 'until_date': 'datetime', - 'parameters_string': 'str' + 'until_date': 'datetime' } attribute_map = { @@ -44,21 +44,21 @@ class OaiListIdentifiersParameters(object): 'until': 'until', 'set': 'set', 'resumption_token': 'resumptionToken', + 'parameters_string': 'parametersString', 'from_date': 'fromDate', - 'until_date': 'untilDate', - 'parameters_string': 'parametersString' + 'until_date': 'untilDate' } - def __init__(self, metadata_prefix=None, _from=None, until=None, set=None, resumption_token=None, from_date=None, until_date=None, parameters_string=None): # noqa: E501 + def __init__(self, metadata_prefix=None, _from=None, until=None, set=None, resumption_token=None, parameters_string=None, from_date=None, until_date=None): # noqa: E501 """OaiListIdentifiersParameters - a model defined in Swagger""" # noqa: E501 self._metadata_prefix = None self.__from = None self._until = None self._set = None self._resumption_token = None + self._parameters_string = None self._from_date = None self._until_date = None - self._parameters_string = None self.discriminator = None if metadata_prefix is not None: self.metadata_prefix = metadata_prefix @@ -70,12 +70,12 @@ class OaiListIdentifiersParameters(object): self.set = set if resumption_token is not None: self.resumption_token = resumption_token + if parameters_string is not None: + self.parameters_string = parameters_string if from_date is not None: self.from_date = from_date if until_date is not None: self.until_date = until_date - if parameters_string is not None: - self.parameters_string = parameters_string @property def metadata_prefix(self): @@ -182,6 +182,27 @@ class OaiListIdentifiersParameters(object): self._resumption_token = resumption_token + @property + def parameters_string(self): + """Gets the parameters_string of this OaiListIdentifiersParameters. # noqa: E501 + + + :return: The parameters_string of this OaiListIdentifiersParameters. # noqa: E501 + :rtype: str + """ + return self._parameters_string + + @parameters_string.setter + def parameters_string(self, parameters_string): + """Sets the parameters_string of this OaiListIdentifiersParameters. + + + :param parameters_string: The parameters_string of this OaiListIdentifiersParameters. # noqa: E501 + :type: str + """ + + self._parameters_string = parameters_string + @property def from_date(self): """Gets the from_date of this OaiListIdentifiersParameters. # noqa: E501 @@ -224,27 +245,6 @@ class OaiListIdentifiersParameters(object): self._until_date = until_date - @property - def parameters_string(self): - """Gets the parameters_string of this OaiListIdentifiersParameters. # noqa: E501 - - - :return: The parameters_string of this OaiListIdentifiersParameters. # noqa: E501 - :rtype: str - """ - return self._parameters_string - - @parameters_string.setter - def parameters_string(self, parameters_string): - """Sets the parameters_string of this OaiListIdentifiersParameters. - - - :param parameters_string: The parameters_string of this OaiListIdentifiersParameters. # noqa: E501 - :type: str - """ - - self._parameters_string = parameters_string - def to_dict(self): """Returns the model properties as a dict""" result = {} diff --git a/swagger/api-metadata/test/test_identify_endpoint_api.py b/swagger/api-metadata/test/test_identify_endpoint_api.py new file mode 100644 index 0000000000000000000000000000000000000000..eab93e97e4d34c6d4dbfb59c1f7dd99845ebe63a --- /dev/null +++ b/swagger/api-metadata/test/test_identify_endpoint_api.py @@ -0,0 +1,40 @@ +# coding: utf-8 + +""" + Database Repository Metadata Service API + + Service that manages the metadata # noqa: E501 + + OpenAPI spec version: 1.1.0-alpha + Contact: andreas.rauber@tuwien.ac.at + Generated by: https://github.com/swagger-api/swagger-codegen.git +""" + +from __future__ import absolute_import + +import unittest + +import swagger_client +from swagger_client.api.identify_endpoint_api import IdentifyEndpointApi # noqa: E501 +from swagger_client.rest import ApiException + + +class TestIdentifyEndpointApi(unittest.TestCase): + """IdentifyEndpointApi unit test stubs""" + + def setUp(self): + self.api = IdentifyEndpointApi() # noqa: E501 + + def tearDown(self): + pass + + def test_identify1111(self): + """Test case for identify1111 + + Get the record # noqa: E501 + """ + pass + + +if __name__ == '__main__': + unittest.main() diff --git a/swagger/api-query.yaml b/swagger/api-query.yaml index 672bcd6b6755d9da9eb0f7bd1ce6886794973395..5929fc5a6d42e745360b0d6a18d05acaa2047387 100644 --- a/swagger/api-query.yaml +++ b/swagger/api-query.yaml @@ -21,7 +21,7 @@ paths: tags: - table-history-endpoint summary: Find all history - operationId: getAll + operationId: getAll_1 parameters: - name: id in: path @@ -86,7 +86,7 @@ paths: tags: - table-history-endpoint summary: Find all history - operationId: getAll_1 + operationId: getAll parameters: - name: id in: path @@ -152,7 +152,7 @@ paths: tags: - table-data-endpoint summary: Find data - operationId: getAll_2 + operationId: getAll_3 parameters: - name: id in: path @@ -428,7 +428,7 @@ paths: tags: - table-data-endpoint summary: Find data - operationId: getAll_3 + operationId: getAll_2 parameters: - name: id in: path @@ -992,6 +992,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -1063,8 +1064,10 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound TableHistoryDto: required: - event @@ -1080,6 +1083,7 @@ components: total: type: integer format: int64 + example: 1 QueryResultDto: required: - id @@ -1098,6 +1102,7 @@ components: resultNumber: type: integer format: int64 + example: 1 TableCsvUpdateDto: required: - data @@ -1119,6 +1124,7 @@ components: properties: statement: type: string + example: SELECT `id` FROM `air_quality` TableCsvDto: required: - data @@ -1136,10 +1142,13 @@ components: properties: location: type: string + example: /tmp/file.csv separator: type: string + example: "," quote: type: string + example: '"' skip_lines: minimum: 0 type: integer @@ -1150,6 +1159,7 @@ components: type: string null_element: type: string + example: NA ContainerDto: required: - created @@ -1164,17 +1174,20 @@ components: format: int64 hash: type: string + example: f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50 name: type: string + example: Air Quality state: type: string + example: running enum: - - ContainerStateDto.CREATED - - ContainerStateDto.RESTARTING - - ContainerStateDto.RUNNING - - ContainerStateDto.PAUSED - - ContainerStateDto.EXITED - - ContainerStateDto.DEAD + - created + - restarting + - running + - paused + - exited + - dead databases: type: array items: @@ -1187,38 +1200,41 @@ components: created: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z internal_name: type: string + example: air-quality ip_address: type: string DatabaseDto: required: - - database creator - - database description - - database exchange - - database id - - database internal name - - database name + - creator + - exchange + - id + - internal_name + - name type: object properties: - database id: + id: type: integer format: int64 - example: 1 - database name: + name: type: string - example: Weather Australia - database exchange: + example: Air Quality + exchange: type: string - database creator: + example: air_quality + creator: $ref: '#/components/schemas/UserBriefDto' - database subjects: + subjects: type: array + description: database subjects items: type: string - database language: + description: database subjects + language: type: string - example: EN + example: en enum: - ab - aa @@ -1404,49 +1420,58 @@ components: - yo - za - zu - database license: + license: $ref: '#/components/schemas/LicenseDto' - database description: + description: type: string - example: Weather Australia 2009-2021 - database publisher: + example: Air Quality in Austria + publisher: type: string example: TU Wien - database contact person: + contact: $ref: '#/components/schemas/UserDto' tables: type: array items: $ref: '#/components/schemas/TableBriefDto' - database container image: + image: $ref: '#/components/schemas/ImageDto' container: $ref: '#/components/schemas/ContainerDto' - database creation time: + created: type: string format: date-time deleted: type: string format: date-time - database internal name: + internal_name: type: string - example: weather_australia - database publication year: + example: air_quality + publication_year: type: integer + description: database publication year format: int32 - database publication month: + example: 2022 + publication_month: type: integer + description: database publication month format: int32 - database publication day: + example: 12 + publication_day: type: integer + description: database publication day format: int32 - database public: + example: 15 + is_public: type: boolean + description: database publicity + example: true GrantedAuthorityDto: type: object properties: authority: type: string + example: ROLE_RESEARCHER ImageBriefDto: required: - id @@ -1459,8 +1484,10 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" ImageDateDto: required: - database_format @@ -1475,12 +1502,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -1501,36 +1532,46 @@ components: format: int64 repository: type: string + example: mariadb tag: type: string + example: "10.5" dialect: type: string + example: org.hibernate.dialect.MariaDBDialect hash: type: string + example: sha256:c5ec7353d87dfc35067e7bffeb25d6a0d52dad41e8b7357213e3b12d6e7ff78e compiled: type: string format: date-time + example: 2021-03-12T15:26:21.678396092Z size: type: integer + example: 314295447 environment: type: array items: $ref: '#/components/schemas/ImageEnvItemDto' driver_class: type: string + example: org.mariadb.jdbc.Driver date_formats: type: array items: $ref: '#/components/schemas/ImageDateDto' jdbc_method: type: string + example: mariadb default_port: type: integer format: int32 + example: 3306 ImageEnvItemDto: required: - iid - key + - type - value type: object properties: @@ -1539,15 +1580,18 @@ components: format: int64 key: type: string + example: MARIADB_ROOT_PASSWORD value: type: string + example: mariadb type: type: string + example: PRIVILEGED_PASSWORD enum: - - USERNAME - - PASSWORD - - PRIVILEGED_USERNAME - - PRIVILEGED_PASSWORD + - username + - password + - privileged_username + - privileged_password LicenseDto: required: - identifier @@ -1556,9 +1600,10 @@ components: properties: identifier: type: string + example: MIT uri: type: string - example: MIT2 + example: https://opensource.org/licenses/MIT QueryBriefDto: required: - cid @@ -1586,18 +1631,23 @@ components: format: date-time query: type: string + example: SELECT `id` FROM `air_quality` created: type: string format: date-time query_normalized: type: string + example: SELECT `id` FROM `air_quality` query_hash: type: string + example: 17e682f060b5f8e47ea04c5c4855908b0a5ad612022260fe50e11ecb0cc0ab76 result_hash: type: string + example: 17e682f060b5f8e47ea04c5c4855908b0a5ad612022260fe50e11ecb0cc0ab76 result_number: type: integer format: int64 + example: 1 last_modified: type: string format: date-time @@ -1614,10 +1664,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserBriefDto: required: - email_verified @@ -1631,22 +1683,31 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true UserDto: required: - email @@ -1665,14 +1726,20 @@ components: $ref: '#/components/schemas/GrantedAuthorityDto' username: type: string + description: Only contains lowercase characters + example: jcarberry firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 containers: type: array items: @@ -1687,14 +1754,18 @@ components: $ref: '#/components/schemas/ContainerDto' email: type: string + example: jcarberry@brown.edu titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true QueryDto: required: - cid @@ -1722,11 +1793,13 @@ components: format: date-time query: type: string + example: SELECT `id` FROM `air_quality` created: type: string format: date-time query_normalized: type: string + example: SELECT `id` FROM `air_quality` query_hash: type: string result_hash: @@ -1734,6 +1807,7 @@ components: result_number: type: integer format: int64 + example: 1 last_modified: type: string format: date-time diff --git a/swagger/api-query/README.md b/swagger/api-query/README.md index 4e3be02a520f2c7b3ea32c68f8fc702625a7ce41..740dae7dbd389b13d9a43b96b0683e5978ae316a 100644 --- a/swagger/api-query/README.md +++ b/swagger/api-query/README.md @@ -80,13 +80,13 @@ Class | Method | HTTP request | Description *StoreEndpointApi* | [**find**](docs/StoreEndpointApi.md#find) | **GET** /api/container/{id}/database/{databaseId}/query/{queryId} | Find some query *StoreEndpointApi* | [**find_all**](docs/StoreEndpointApi.md#find_all) | **GET** /api/container/{id}/database/{databaseId}/query | Find queries *TableDataEndpointApi* | [**delete**](docs/TableDataEndpointApi.md#delete) | **DELETE** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Delete data -*TableDataEndpointApi* | [**get_all2**](docs/TableDataEndpointApi.md#get_all2) | **GET** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Find data -*TableDataEndpointApi* | [**get_all3**](docs/TableDataEndpointApi.md#get_all3) | **HEAD** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Find data +*TableDataEndpointApi* | [**get_all2**](docs/TableDataEndpointApi.md#get_all2) | **HEAD** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Find data +*TableDataEndpointApi* | [**get_all3**](docs/TableDataEndpointApi.md#get_all3) | **GET** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Find data *TableDataEndpointApi* | [**import_csv**](docs/TableDataEndpointApi.md#import_csv) | **POST** /api/container/{id}/database/{databaseId}/table/{tableId}/data/import | Insert data from csv *TableDataEndpointApi* | [**insert**](docs/TableDataEndpointApi.md#insert) | **POST** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Insert data *TableDataEndpointApi* | [**update**](docs/TableDataEndpointApi.md#update) | **PUT** /api/container/{id}/database/{databaseId}/table/{tableId}/data | Update data -*TableHistoryEndpointApi* | [**get_all**](docs/TableHistoryEndpointApi.md#get_all) | **GET** /api/container/{id}/database/{databaseId}/table/{tableId}/history | Find all history -*TableHistoryEndpointApi* | [**get_all1**](docs/TableHistoryEndpointApi.md#get_all1) | **HEAD** /api/container/{id}/database/{databaseId}/table/{tableId}/history | Find all history +*TableHistoryEndpointApi* | [**get_all**](docs/TableHistoryEndpointApi.md#get_all) | **HEAD** /api/container/{id}/database/{databaseId}/table/{tableId}/history | Find all history +*TableHistoryEndpointApi* | [**get_all1**](docs/TableHistoryEndpointApi.md#get_all1) | **GET** /api/container/{id}/database/{databaseId}/table/{tableId}/history | Find all history ## Documentation For Models diff --git a/swagger/api-query/swagger_client/api/table_data_endpoint_api.py b/swagger/api-query/swagger_client/api/table_data_endpoint_api.py index 496b6812d98a03a98bf715f52784daa6dbfa461b..8e0545b63dbabbc0db9c8a2c72d399590cf892a8 100644 --- a/swagger/api-query/swagger_client/api/table_data_endpoint_api.py +++ b/swagger/api-query/swagger_client/api/table_data_endpoint_api.py @@ -259,7 +259,7 @@ class TableDataEndpointApi(object): auth_settings = ['bearerAuth'] # noqa: E501 return self.api_client.call_api( - '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET', + '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD', path_params, query_params, header_params, @@ -380,7 +380,7 @@ class TableDataEndpointApi(object): auth_settings = ['bearerAuth'] # noqa: E501 return self.api_client.call_api( - '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD', + '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET', path_params, query_params, header_params, diff --git a/swagger/api-query/swagger_client/api/table_history_endpoint_api.py b/swagger/api-query/swagger_client/api/table_history_endpoint_api.py index 8217454744ae26f0346a0cf309c2a91cdba78135..b8d2b5454cc287afb8a043aeac6e4e777508033e 100644 --- a/swagger/api-query/swagger_client/api/table_history_endpoint_api.py +++ b/swagger/api-query/swagger_client/api/table_history_endpoint_api.py @@ -126,7 +126,7 @@ class TableHistoryEndpointApi(object): auth_settings = ['bearerAuth'] # noqa: E501 return self.api_client.call_api( - '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'GET', + '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'HEAD', path_params, query_params, header_params, @@ -235,7 +235,7 @@ class TableHistoryEndpointApi(object): auth_settings = ['bearerAuth'] # noqa: E501 return self.api_client.call_api( - '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'HEAD', + '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'GET', path_params, query_params, header_params, diff --git a/swagger/api-query/swagger_client/models/container_dto.py b/swagger/api-query/swagger_client/models/container_dto.py index 2bb0a530aae1ed016e1daa786724eccfa9f3f95a..2869b35048a30bc5d5a0afe173526c738885301e 100644 --- a/swagger/api-query/swagger_client/models/container_dto.py +++ b/swagger/api-query/swagger_client/models/container_dto.py @@ -169,7 +169,7 @@ class ContainerDto(object): :param state: The state of this ContainerDto. # noqa: E501 :type: str """ - allowed_values = ["ContainerStateDto.CREATED", "ContainerStateDto.RESTARTING", "ContainerStateDto.RUNNING", "ContainerStateDto.PAUSED", "ContainerStateDto.EXITED", "ContainerStateDto.DEAD"] # noqa: E501 + allowed_values = ["created", "restarting", "running", "paused", "exited", "dead"] # noqa: E501 if state not in allowed_values: raise ValueError( "Invalid value for `state` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-query/swagger_client/models/database_dto.py b/swagger/api-query/swagger_client/models/database_dto.py index fb94bfb4d9045bb7ad5ff5789c279538827cdf25..4b2785c269d94113cfb0bb7230b25cb2f31660be 100644 --- a/swagger/api-query/swagger_client/models/database_dto.py +++ b/swagger/api-query/swagger_client/models/database_dto.py @@ -28,334 +28,335 @@ class DatabaseDto(object): and the value is json key in definition. """ swagger_types = { - 'database_id': 'int', - 'database_name': 'str', - 'database_exchange': 'str', - 'database_creator': 'UserBriefDto', - 'database_subjects': 'list[str]', - 'database_language': 'str', - 'database_license': 'LicenseDto', - 'database_description': 'str', - 'database_publisher': 'str', - 'database_contact_person': 'UserDto', + 'id': 'int', + 'name': 'str', + 'exchange': 'str', + 'creator': 'UserBriefDto', + 'subjects': 'list[str]', + 'language': 'str', + 'license': 'LicenseDto', + 'description': 'str', + 'publisher': 'str', + 'contact': 'UserDto', 'tables': 'list[TableBriefDto]', - 'database_container_image': 'ImageDto', + 'image': 'ImageDto', 'container': 'ContainerDto', - 'database_creation_time': 'datetime', + 'created': 'datetime', 'deleted': 'datetime', - 'database_internal_name': 'str', - 'database_publication_year': 'int', - 'database_publication_month': 'int', - 'database_publication_day': 'int', - 'database_public': 'bool' + 'internal_name': 'str', + 'publication_year': 'int', + 'publication_month': 'int', + 'publication_day': 'int', + 'is_public': 'bool' } attribute_map = { - 'database_id': 'database id', - 'database_name': 'database name', - 'database_exchange': 'database exchange', - 'database_creator': 'database creator', - 'database_subjects': 'database subjects', - 'database_language': 'database language', - 'database_license': 'database license', - 'database_description': 'database description', - 'database_publisher': 'database publisher', - 'database_contact_person': 'database contact person', + 'id': 'id', + 'name': 'name', + 'exchange': 'exchange', + 'creator': 'creator', + 'subjects': 'subjects', + 'language': 'language', + 'license': 'license', + 'description': 'description', + 'publisher': 'publisher', + 'contact': 'contact', 'tables': 'tables', - 'database_container_image': 'database container image', + 'image': 'image', 'container': 'container', - 'database_creation_time': 'database creation time', + 'created': 'created', 'deleted': 'deleted', - 'database_internal_name': 'database internal name', - 'database_publication_year': 'database publication year', - 'database_publication_month': 'database publication month', - 'database_publication_day': 'database publication day', - 'database_public': 'database public' + 'internal_name': 'internal_name', + 'publication_year': 'publication_year', + 'publication_month': 'publication_month', + 'publication_day': 'publication_day', + 'is_public': 'is_public' } - def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None): # noqa: E501 + def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, contact=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None): # noqa: E501 """DatabaseDto - a model defined in Swagger""" # noqa: E501 - self._database_id = None - self._database_name = None - self._database_exchange = None - self._database_creator = None - self._database_subjects = None - self._database_language = None - self._database_license = None - self._database_description = None - self._database_publisher = None - self._database_contact_person = None + self._id = None + self._name = None + self._exchange = None + self._creator = None + self._subjects = None + self._language = None + self._license = None + self._description = None + self._publisher = None + self._contact = None self._tables = None - self._database_container_image = None + self._image = None self._container = None - self._database_creation_time = None + self._created = None self._deleted = None - self._database_internal_name = None - self._database_publication_year = None - self._database_publication_month = None - self._database_publication_day = None - self._database_public = None + self._internal_name = None + self._publication_year = None + self._publication_month = None + self._publication_day = None + self._is_public = None self.discriminator = None - self.database_id = database_id - self.database_name = database_name - self.database_exchange = database_exchange - self.database_creator = database_creator - if database_subjects is not None: - self.database_subjects = database_subjects - if database_language is not None: - self.database_language = database_language - if database_license is not None: - self.database_license = database_license - self.database_description = database_description - if database_publisher is not None: - self.database_publisher = database_publisher - if database_contact_person is not None: - self.database_contact_person = database_contact_person + self.id = id + self.name = name + self.exchange = exchange + self.creator = creator + if subjects is not None: + self.subjects = subjects + if language is not None: + self.language = language + if license is not None: + self.license = license + if description is not None: + self.description = description + if publisher is not None: + self.publisher = publisher + if contact is not None: + self.contact = contact if tables is not None: self.tables = tables - if database_container_image is not None: - self.database_container_image = database_container_image + if image is not None: + self.image = image if container is not None: self.container = container - if database_creation_time is not None: - self.database_creation_time = database_creation_time + if created is not None: + self.created = created if deleted is not None: self.deleted = deleted - self.database_internal_name = database_internal_name - if database_publication_year is not None: - self.database_publication_year = database_publication_year - if database_publication_month is not None: - self.database_publication_month = database_publication_month - if database_publication_day is not None: - self.database_publication_day = database_publication_day - if database_public is not None: - self.database_public = database_public + self.internal_name = internal_name + if publication_year is not None: + self.publication_year = publication_year + if publication_month is not None: + self.publication_month = publication_month + if publication_day is not None: + self.publication_day = publication_day + if is_public is not None: + self.is_public = is_public @property - def database_id(self): - """Gets the database_id of this DatabaseDto. # noqa: E501 + def id(self): + """Gets the id of this DatabaseDto. # noqa: E501 - :return: The database_id of this DatabaseDto. # noqa: E501 + :return: The id of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_id + return self._id - @database_id.setter - def database_id(self, database_id): - """Sets the database_id of this DatabaseDto. + @id.setter + def id(self, id): + """Sets the id of this DatabaseDto. - :param database_id: The database_id of this DatabaseDto. # noqa: E501 + :param id: The id of this DatabaseDto. # noqa: E501 :type: int """ - if database_id is None: - raise ValueError("Invalid value for `database_id`, must not be `None`") # noqa: E501 + if id is None: + raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501 - self._database_id = database_id + self._id = id @property - def database_name(self): - """Gets the database_name of this DatabaseDto. # noqa: E501 + def name(self): + """Gets the name of this DatabaseDto. # noqa: E501 - :return: The database_name of this DatabaseDto. # noqa: E501 + :return: The name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_name + return self._name - @database_name.setter - def database_name(self, database_name): - """Sets the database_name of this DatabaseDto. + @name.setter + def name(self, name): + """Sets the name of this DatabaseDto. - :param database_name: The database_name of this DatabaseDto. # noqa: E501 + :param name: The name of this DatabaseDto. # noqa: E501 :type: str """ - if database_name is None: - raise ValueError("Invalid value for `database_name`, must not be `None`") # noqa: E501 + if name is None: + raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501 - self._database_name = database_name + self._name = name @property - def database_exchange(self): - """Gets the database_exchange of this DatabaseDto. # noqa: E501 + def exchange(self): + """Gets the exchange of this DatabaseDto. # noqa: E501 - :return: The database_exchange of this DatabaseDto. # noqa: E501 + :return: The exchange of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_exchange + return self._exchange - @database_exchange.setter - def database_exchange(self, database_exchange): - """Sets the database_exchange of this DatabaseDto. + @exchange.setter + def exchange(self, exchange): + """Sets the exchange of this DatabaseDto. - :param database_exchange: The database_exchange of this DatabaseDto. # noqa: E501 + :param exchange: The exchange of this DatabaseDto. # noqa: E501 :type: str """ - if database_exchange is None: - raise ValueError("Invalid value for `database_exchange`, must not be `None`") # noqa: E501 + if exchange is None: + raise ValueError("Invalid value for `exchange`, must not be `None`") # noqa: E501 - self._database_exchange = database_exchange + self._exchange = exchange @property - def database_creator(self): - """Gets the database_creator of this DatabaseDto. # noqa: E501 + def creator(self): + """Gets the creator of this DatabaseDto. # noqa: E501 - :return: The database_creator of this DatabaseDto. # noqa: E501 + :return: The creator of this DatabaseDto. # noqa: E501 :rtype: UserBriefDto """ - return self._database_creator + return self._creator - @database_creator.setter - def database_creator(self, database_creator): - """Sets the database_creator of this DatabaseDto. + @creator.setter + def creator(self, creator): + """Sets the creator of this DatabaseDto. - :param database_creator: The database_creator of this DatabaseDto. # noqa: E501 + :param creator: The creator of this DatabaseDto. # noqa: E501 :type: UserBriefDto """ - if database_creator is None: - raise ValueError("Invalid value for `database_creator`, must not be `None`") # noqa: E501 + if creator is None: + raise ValueError("Invalid value for `creator`, must not be `None`") # noqa: E501 - self._database_creator = database_creator + self._creator = creator @property - def database_subjects(self): - """Gets the database_subjects of this DatabaseDto. # noqa: E501 + def subjects(self): + """Gets the subjects of this DatabaseDto. # noqa: E501 + database subjects # noqa: E501 - :return: The database_subjects of this DatabaseDto. # noqa: E501 + :return: The subjects of this DatabaseDto. # noqa: E501 :rtype: list[str] """ - return self._database_subjects + return self._subjects - @database_subjects.setter - def database_subjects(self, database_subjects): - """Sets the database_subjects of this DatabaseDto. + @subjects.setter + def subjects(self, subjects): + """Sets the subjects of this DatabaseDto. + database subjects # noqa: E501 - :param database_subjects: The database_subjects of this DatabaseDto. # noqa: E501 + :param subjects: The subjects of this DatabaseDto. # noqa: E501 :type: list[str] """ - self._database_subjects = database_subjects + self._subjects = subjects @property - def database_language(self): - """Gets the database_language of this DatabaseDto. # noqa: E501 + def language(self): + """Gets the language of this DatabaseDto. # noqa: E501 - :return: The database_language of this DatabaseDto. # noqa: E501 + :return: The language of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_language + return self._language - @database_language.setter - def database_language(self, database_language): - """Sets the database_language of this DatabaseDto. + @language.setter + def language(self, language): + """Sets the language of this DatabaseDto. - :param database_language: The database_language of this DatabaseDto. # noqa: E501 + :param language: The language of this DatabaseDto. # noqa: E501 :type: str """ allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"] # noqa: E501 - if database_language not in allowed_values: + if language not in allowed_values: raise ValueError( - "Invalid value for `database_language` ({0}), must be one of {1}" # noqa: E501 - .format(database_language, allowed_values) + "Invalid value for `language` ({0}), must be one of {1}" # noqa: E501 + .format(language, allowed_values) ) - self._database_language = database_language + self._language = language @property - def database_license(self): - """Gets the database_license of this DatabaseDto. # noqa: E501 + def license(self): + """Gets the license of this DatabaseDto. # noqa: E501 - :return: The database_license of this DatabaseDto. # noqa: E501 + :return: The license of this DatabaseDto. # noqa: E501 :rtype: LicenseDto """ - return self._database_license + return self._license - @database_license.setter - def database_license(self, database_license): - """Sets the database_license of this DatabaseDto. + @license.setter + def license(self, license): + """Sets the license of this DatabaseDto. - :param database_license: The database_license of this DatabaseDto. # noqa: E501 + :param license: The license of this DatabaseDto. # noqa: E501 :type: LicenseDto """ - self._database_license = database_license + self._license = license @property - def database_description(self): - """Gets the database_description of this DatabaseDto. # noqa: E501 + def description(self): + """Gets the description of this DatabaseDto. # noqa: E501 - :return: The database_description of this DatabaseDto. # noqa: E501 + :return: The description of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_description + return self._description - @database_description.setter - def database_description(self, database_description): - """Sets the database_description of this DatabaseDto. + @description.setter + def description(self, description): + """Sets the description of this DatabaseDto. - :param database_description: The database_description of this DatabaseDto. # noqa: E501 + :param description: The description of this DatabaseDto. # noqa: E501 :type: str """ - if database_description is None: - raise ValueError("Invalid value for `database_description`, must not be `None`") # noqa: E501 - self._database_description = database_description + self._description = description @property - def database_publisher(self): - """Gets the database_publisher of this DatabaseDto. # noqa: E501 + def publisher(self): + """Gets the publisher of this DatabaseDto. # noqa: E501 - :return: The database_publisher of this DatabaseDto. # noqa: E501 + :return: The publisher of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_publisher + return self._publisher - @database_publisher.setter - def database_publisher(self, database_publisher): - """Sets the database_publisher of this DatabaseDto. + @publisher.setter + def publisher(self, publisher): + """Sets the publisher of this DatabaseDto. - :param database_publisher: The database_publisher of this DatabaseDto. # noqa: E501 + :param publisher: The publisher of this DatabaseDto. # noqa: E501 :type: str """ - self._database_publisher = database_publisher + self._publisher = publisher @property - def database_contact_person(self): - """Gets the database_contact_person of this DatabaseDto. # noqa: E501 + def contact(self): + """Gets the contact of this DatabaseDto. # noqa: E501 - :return: The database_contact_person of this DatabaseDto. # noqa: E501 + :return: The contact of this DatabaseDto. # noqa: E501 :rtype: UserDto """ - return self._database_contact_person + return self._contact - @database_contact_person.setter - def database_contact_person(self, database_contact_person): - """Sets the database_contact_person of this DatabaseDto. + @contact.setter + def contact(self, contact): + """Sets the contact of this DatabaseDto. - :param database_contact_person: The database_contact_person of this DatabaseDto. # noqa: E501 + :param contact: The contact of this DatabaseDto. # noqa: E501 :type: UserDto """ - self._database_contact_person = database_contact_person + self._contact = contact @property def tables(self): @@ -379,25 +380,25 @@ class DatabaseDto(object): self._tables = tables @property - def database_container_image(self): - """Gets the database_container_image of this DatabaseDto. # noqa: E501 + def image(self): + """Gets the image of this DatabaseDto. # noqa: E501 - :return: The database_container_image of this DatabaseDto. # noqa: E501 + :return: The image of this DatabaseDto. # noqa: E501 :rtype: ImageDto """ - return self._database_container_image + return self._image - @database_container_image.setter - def database_container_image(self, database_container_image): - """Sets the database_container_image of this DatabaseDto. + @image.setter + def image(self, image): + """Sets the image of this DatabaseDto. - :param database_container_image: The database_container_image of this DatabaseDto. # noqa: E501 + :param image: The image of this DatabaseDto. # noqa: E501 :type: ImageDto """ - self._database_container_image = database_container_image + self._image = image @property def container(self): @@ -421,25 +422,25 @@ class DatabaseDto(object): self._container = container @property - def database_creation_time(self): - """Gets the database_creation_time of this DatabaseDto. # noqa: E501 + def created(self): + """Gets the created of this DatabaseDto. # noqa: E501 - :return: The database_creation_time of this DatabaseDto. # noqa: E501 + :return: The created of this DatabaseDto. # noqa: E501 :rtype: datetime """ - return self._database_creation_time + return self._created - @database_creation_time.setter - def database_creation_time(self, database_creation_time): - """Sets the database_creation_time of this DatabaseDto. + @created.setter + def created(self, created): + """Sets the created of this DatabaseDto. - :param database_creation_time: The database_creation_time of this DatabaseDto. # noqa: E501 + :param created: The created of this DatabaseDto. # noqa: E501 :type: datetime """ - self._database_creation_time = database_creation_time + self._created = created @property def deleted(self): @@ -463,111 +464,119 @@ class DatabaseDto(object): self._deleted = deleted @property - def database_internal_name(self): - """Gets the database_internal_name of this DatabaseDto. # noqa: E501 + def internal_name(self): + """Gets the internal_name of this DatabaseDto. # noqa: E501 - :return: The database_internal_name of this DatabaseDto. # noqa: E501 + :return: The internal_name of this DatabaseDto. # noqa: E501 :rtype: str """ - return self._database_internal_name + return self._internal_name - @database_internal_name.setter - def database_internal_name(self, database_internal_name): - """Sets the database_internal_name of this DatabaseDto. + @internal_name.setter + def internal_name(self, internal_name): + """Sets the internal_name of this DatabaseDto. - :param database_internal_name: The database_internal_name of this DatabaseDto. # noqa: E501 + :param internal_name: The internal_name of this DatabaseDto. # noqa: E501 :type: str """ - if database_internal_name is None: - raise ValueError("Invalid value for `database_internal_name`, must not be `None`") # noqa: E501 + if internal_name is None: + raise ValueError("Invalid value for `internal_name`, must not be `None`") # noqa: E501 - self._database_internal_name = database_internal_name + self._internal_name = internal_name @property - def database_publication_year(self): - """Gets the database_publication_year of this DatabaseDto. # noqa: E501 + def publication_year(self): + """Gets the publication_year of this DatabaseDto. # noqa: E501 + database publication year # noqa: E501 - :return: The database_publication_year of this DatabaseDto. # noqa: E501 + :return: The publication_year of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_year + return self._publication_year - @database_publication_year.setter - def database_publication_year(self, database_publication_year): - """Sets the database_publication_year of this DatabaseDto. + @publication_year.setter + def publication_year(self, publication_year): + """Sets the publication_year of this DatabaseDto. + database publication year # noqa: E501 - :param database_publication_year: The database_publication_year of this DatabaseDto. # noqa: E501 + :param publication_year: The publication_year of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_year = database_publication_year + self._publication_year = publication_year @property - def database_publication_month(self): - """Gets the database_publication_month of this DatabaseDto. # noqa: E501 + def publication_month(self): + """Gets the publication_month of this DatabaseDto. # noqa: E501 + database publication month # noqa: E501 - :return: The database_publication_month of this DatabaseDto. # noqa: E501 + :return: The publication_month of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_month + return self._publication_month - @database_publication_month.setter - def database_publication_month(self, database_publication_month): - """Sets the database_publication_month of this DatabaseDto. + @publication_month.setter + def publication_month(self, publication_month): + """Sets the publication_month of this DatabaseDto. + database publication month # noqa: E501 - :param database_publication_month: The database_publication_month of this DatabaseDto. # noqa: E501 + :param publication_month: The publication_month of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_month = database_publication_month + self._publication_month = publication_month @property - def database_publication_day(self): - """Gets the database_publication_day of this DatabaseDto. # noqa: E501 + def publication_day(self): + """Gets the publication_day of this DatabaseDto. # noqa: E501 + database publication day # noqa: E501 - :return: The database_publication_day of this DatabaseDto. # noqa: E501 + :return: The publication_day of this DatabaseDto. # noqa: E501 :rtype: int """ - return self._database_publication_day + return self._publication_day - @database_publication_day.setter - def database_publication_day(self, database_publication_day): - """Sets the database_publication_day of this DatabaseDto. + @publication_day.setter + def publication_day(self, publication_day): + """Sets the publication_day of this DatabaseDto. + database publication day # noqa: E501 - :param database_publication_day: The database_publication_day of this DatabaseDto. # noqa: E501 + :param publication_day: The publication_day of this DatabaseDto. # noqa: E501 :type: int """ - self._database_publication_day = database_publication_day + self._publication_day = publication_day @property - def database_public(self): - """Gets the database_public of this DatabaseDto. # noqa: E501 + def is_public(self): + """Gets the is_public of this DatabaseDto. # noqa: E501 + database publicity # noqa: E501 - :return: The database_public of this DatabaseDto. # noqa: E501 + :return: The is_public of this DatabaseDto. # noqa: E501 :rtype: bool """ - return self._database_public + return self._is_public - @database_public.setter - def database_public(self, database_public): - """Sets the database_public of this DatabaseDto. + @is_public.setter + def is_public(self, is_public): + """Sets the is_public of this DatabaseDto. + database publicity # noqa: E501 - :param database_public: The database_public of this DatabaseDto. # noqa: E501 + :param is_public: The is_public of this DatabaseDto. # noqa: E501 :type: bool """ - self._database_public = database_public + self._is_public = is_public def to_dict(self): """Returns the model properties as a dict""" diff --git a/swagger/api-query/swagger_client/models/image_env_item_dto.py b/swagger/api-query/swagger_client/models/image_env_item_dto.py index 73c5fbab7092aeb3e00129d0546064469523d009..521b735ee2ca69d6b694e6ade5cdc4de63c36478 100644 --- a/swagger/api-query/swagger_client/models/image_env_item_dto.py +++ b/swagger/api-query/swagger_client/models/image_env_item_dto.py @@ -51,8 +51,7 @@ class ImageEnvItemDto(object): self.iid = iid self.key = key self.value = value - if type is not None: - self.type = type + self.type = type @property def iid(self): @@ -141,7 +140,9 @@ class ImageEnvItemDto(object): :param type: The type of this ImageEnvItemDto. # noqa: E501 :type: str """ - allowed_values = ["USERNAME", "PASSWORD", "PRIVILEGED_USERNAME", "PRIVILEGED_PASSWORD"] # noqa: E501 + if type is None: + raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501 + allowed_values = ["username", "password", "privileged_username", "privileged_password"] # noqa: E501 if type not in allowed_values: raise ValueError( "Invalid value for `type` ({0}), must be one of {1}" # noqa: E501 diff --git a/swagger/api-query/swagger_client/models/user_brief_dto.py b/swagger/api-query/swagger_client/models/user_brief_dto.py index 20e36cd32ecd6911d7a6b34c83695e997df801c3..c29510792162b1cdc193a1068c52cbdd470949dc 100644 --- a/swagger/api-query/swagger_client/models/user_brief_dto.py +++ b/swagger/api-query/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/api-query/swagger_client/models/user_dto.py b/swagger/api-query/swagger_client/models/user_dto.py index e0f2dc8d8c065a386cc5c758b7f344328324d94f..6c3503411c21a5595d2818e6a107656da6b9e2ce 100644 --- a/swagger/api-query/swagger_client/models/user_dto.py +++ b/swagger/api-query/swagger_client/models/user_dto.py @@ -155,6 +155,7 @@ class UserDto(object): def username(self): """Gets the username of this UserDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserDto. # noqa: E501 :rtype: str @@ -165,6 +166,7 @@ class UserDto(object): def username(self, username): """Sets the username of this UserDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserDto. # noqa: E501 :type: str diff --git a/swagger/api-table.yaml b/swagger/api-table.yaml index 20727c9f3705b3e2812c0b946f297ff0dfb2ac0c..122ec5d0559909ae4a051963cd3e143f4979fdb5 100644 --- a/swagger/api-table.yaml +++ b/swagger/api-table.yaml @@ -167,6 +167,11 @@ paths: schema: type: integer format: int64 + - name: Authorization + in: header + required: true + schema: + type: string responses: "400": description: Bad Request @@ -280,6 +285,11 @@ paths: schema: type: integer format: int64 + - name: Authorization + in: header + required: true + schema: + type: string requestBody: content: application/json: @@ -336,6 +346,7 @@ components: properties: status: type: string + example: NOT_FOUND enum: - 100 CONTINUE - 101 SWITCHING_PROTOCOLS @@ -407,8 +418,10 @@ components: - 511 NETWORK_AUTHENTICATION_REQUIRED message: type: string + example: Could not find container code: type: string + example: error.container.notfound TableBriefDto: required: - creator @@ -422,10 +435,12 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' internal_name: type: string + example: air_quality UserBriefDto: required: - email_verified @@ -439,22 +454,31 @@ components: format: int64 username: type: string + description: Only contains lowercase characters + example: user firstname: type: string + example: Josiah lastname: type: string + example: Carberry affiliation: type: string + example: Brown University orcid: type: string + example: 0000-0002-1825-0097 titles_before: type: string + example: Prof. titles_after: type: string theme_dark: type: boolean + example: true email_verified: type: boolean + example: true ColumnCreateDto: required: - name @@ -466,8 +490,10 @@ components: properties: name: type: string + example: Date type: type: string + example: string enum: - enum - number @@ -480,15 +506,19 @@ components: - blob dfid: type: integer + description: date format id format: int64 unique: type: boolean + example: false references: type: string primary_key: type: boolean + example: false null_allowed: type: boolean + example: true check_expression: type: string foreign_key: @@ -506,8 +536,10 @@ components: properties: name: type: string + example: Air Quality description: type: string + example: Air Quality in Austria columns: type: array items: @@ -529,20 +561,26 @@ components: format: int64 name: type: string + example: Date unique: type: boolean + example: true references: type: string internal_name: type: string + example: mdb_date date_format: $ref: '#/components/schemas/ImageDateDto' auto_generated: type: boolean + example: false is_primary_key: type: boolean + example: true column_type: type: string + example: string enum: - enum - number @@ -555,14 +593,9 @@ components: - blob column_concept: $ref: '#/components/schemas/ConceptDto' - decimal_digits_before: - type: integer - format: int64 - decimal_digits_after: - type: integer - format: int64 is_null_allowed: type: boolean + example: false check_expression: type: string foreign_key: @@ -599,12 +632,16 @@ components: format: int64 example: type: string + example: 30.01.2022 database_format: type: string + example: '%d.%c.%Y' unix_format: type: string + example: dd.MM.YYYY has_time: type: boolean + example: false created_at: type: string format: date-time @@ -624,12 +661,15 @@ components: format: int64 name: type: string + example: Air Quality creator: $ref: '#/components/schemas/UserBriefDto' topic: type: string + example: air_quality description: type: string + example: Air Quality in Austria created: type: string format: date-time @@ -639,6 +679,7 @@ components: $ref: '#/components/schemas/ColumnDto' internal_name: type: string + example: air_quality securitySchemes: bearerAuth: type: http diff --git a/swagger/api-table/README.md b/swagger/api-table/README.md index 0a92d1eae838bc525564c67e439b87714f076467..4ad57b9ecdc0b6dc5d7a8c48ac6939a0b0a39492 100644 --- a/swagger/api-table/README.md +++ b/swagger/api-table/README.md @@ -55,12 +55,13 @@ from pprint import pprint # create an instance of the API class api_instance = swagger_client.TableEndpointApi(swagger_client.ApiClient(configuration)) body = swagger_client.TableCreateDto() # TableCreateDto | +authorization = 'authorization_example' # str | id = 789 # int | database_id = 789 # int | try: # Create a table - api_response = api_instance.create(body, id, database_id) + api_response = api_instance.create(body, authorization, id, database_id) pprint(api_response) except ApiException as e: print("Exception when calling TableEndpointApi->create: %s\n" % e) @@ -71,10 +72,11 @@ api_instance = swagger_client.TableEndpointApi(swagger_client.ApiClient(configur id = 789 # int | database_id = 789 # int | table_id = 789 # int | +authorization = 'authorization_example' # str | try: # Delete a table - api_instance.delete(id, database_id, table_id) + api_instance.delete(id, database_id, table_id, authorization) except ApiException as e: print("Exception when calling TableEndpointApi->delete: %s\n" % e) diff --git a/swagger/api-table/swagger_client/api/table_endpoint_api.py b/swagger/api-table/swagger_client/api/table_endpoint_api.py index f5e247af645bf848ba3c7d7bfce8c50b491caa18..a51fcf0d098799acbbef86e1d041d522e2cd7a72 100644 --- a/swagger/api-table/swagger_client/api/table_endpoint_api.py +++ b/swagger/api-table/swagger_client/api/table_endpoint_api.py @@ -32,16 +32,17 @@ class TableEndpointApi(object): api_client = ApiClient() self.api_client = api_client - def create(self, body, id, database_id, **kwargs): # noqa: E501 + def create(self, body, authorization, id, database_id, **kwargs): # noqa: E501 """Create a table # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.create(body, id, database_id, async_req=True) + >>> thread = api.create(body, authorization, id, database_id, async_req=True) >>> result = thread.get() :param async_req bool :param TableCreateDto body: (required) + :param str authorization: (required) :param int id: (required) :param int database_id: (required) :return: TableBriefDto @@ -50,21 +51,22 @@ class TableEndpointApi(object): """ kwargs['_return_http_data_only'] = True if kwargs.get('async_req'): - return self.create_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + return self.create_with_http_info(body, authorization, id, database_id, **kwargs) # noqa: E501 else: - (data) = self.create_with_http_info(body, id, database_id, **kwargs) # noqa: E501 + (data) = self.create_with_http_info(body, authorization, id, database_id, **kwargs) # noqa: E501 return data - def create_with_http_info(self, body, id, database_id, **kwargs): # noqa: E501 + def create_with_http_info(self, body, authorization, id, database_id, **kwargs): # noqa: E501 """Create a table # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.create_with_http_info(body, id, database_id, async_req=True) + >>> thread = api.create_with_http_info(body, authorization, id, database_id, async_req=True) >>> result = thread.get() :param async_req bool :param TableCreateDto body: (required) + :param str authorization: (required) :param int id: (required) :param int database_id: (required) :return: TableBriefDto @@ -72,7 +74,7 @@ class TableEndpointApi(object): returns the request thread. """ - all_params = ['body', 'id', 'database_id'] # noqa: E501 + all_params = ['body', 'authorization', 'id', 'database_id'] # noqa: E501 all_params.append('async_req') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -91,6 +93,10 @@ class TableEndpointApi(object): if ('body' not in params or params['body'] is None): raise ValueError("Missing the required parameter `body` when calling `create`") # noqa: E501 + # verify the required parameter 'authorization' is set + if ('authorization' not in params or + params['authorization'] is None): + raise ValueError("Missing the required parameter `authorization` when calling `create`") # noqa: E501 # verify the required parameter 'id' is set if ('id' not in params or params['id'] is None): @@ -111,6 +117,8 @@ class TableEndpointApi(object): query_params = [] header_params = {} + if 'authorization' in params: + header_params['Authorization'] = params['authorization'] # noqa: E501 form_params = [] local_var_files = {} @@ -145,47 +153,49 @@ class TableEndpointApi(object): _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def delete(self, id, database_id, table_id, **kwargs): # noqa: E501 + def delete(self, id, database_id, table_id, authorization, **kwargs): # noqa: E501 """Delete a table # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.delete(id, database_id, table_id, async_req=True) + >>> thread = api.delete(id, database_id, table_id, authorization, async_req=True) >>> result = thread.get() :param async_req bool :param int id: (required) :param int database_id: (required) :param int table_id: (required) + :param str authorization: (required) :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True if kwargs.get('async_req'): - return self.delete_with_http_info(id, database_id, table_id, **kwargs) # noqa: E501 + return self.delete_with_http_info(id, database_id, table_id, authorization, **kwargs) # noqa: E501 else: - (data) = self.delete_with_http_info(id, database_id, table_id, **kwargs) # noqa: E501 + (data) = self.delete_with_http_info(id, database_id, table_id, authorization, **kwargs) # noqa: E501 return data - def delete_with_http_info(self, id, database_id, table_id, **kwargs): # noqa: E501 + def delete_with_http_info(self, id, database_id, table_id, authorization, **kwargs): # noqa: E501 """Delete a table # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True - >>> thread = api.delete_with_http_info(id, database_id, table_id, async_req=True) + >>> thread = api.delete_with_http_info(id, database_id, table_id, authorization, async_req=True) >>> result = thread.get() :param async_req bool :param int id: (required) :param int database_id: (required) :param int table_id: (required) + :param str authorization: (required) :return: None If the method is called asynchronously, returns the request thread. """ - all_params = ['id', 'database_id', 'table_id'] # noqa: E501 + all_params = ['id', 'database_id', 'table_id', 'authorization'] # noqa: E501 all_params.append('async_req') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -212,6 +222,10 @@ class TableEndpointApi(object): if ('table_id' not in params or params['table_id'] is None): raise ValueError("Missing the required parameter `table_id` when calling `delete`") # noqa: E501 + # verify the required parameter 'authorization' is set + if ('authorization' not in params or + params['authorization'] is None): + raise ValueError("Missing the required parameter `authorization` when calling `delete`") # noqa: E501 collection_formats = {} @@ -226,6 +240,8 @@ class TableEndpointApi(object): query_params = [] header_params = {} + if 'authorization' in params: + header_params['Authorization'] = params['authorization'] # noqa: E501 form_params = [] local_var_files = {} diff --git a/swagger/api-table/swagger_client/models/column_create_dto.py b/swagger/api-table/swagger_client/models/column_create_dto.py index da2d3b81f6f29594e466d6831c3b76cd85738a22..5c14839dd9683c72ffe8de93612c9c5944a723e0 100644 --- a/swagger/api-table/swagger_client/models/column_create_dto.py +++ b/swagger/api-table/swagger_client/models/column_create_dto.py @@ -138,6 +138,7 @@ class ColumnCreateDto(object): def dfid(self): """Gets the dfid of this ColumnCreateDto. # noqa: E501 + date format id # noqa: E501 :return: The dfid of this ColumnCreateDto. # noqa: E501 :rtype: int @@ -148,6 +149,7 @@ class ColumnCreateDto(object): def dfid(self, dfid): """Sets the dfid of this ColumnCreateDto. + date format id # noqa: E501 :param dfid: The dfid of this ColumnCreateDto. # noqa: E501 :type: int diff --git a/swagger/api-table/swagger_client/models/column_dto.py b/swagger/api-table/swagger_client/models/column_dto.py index 965d0658fd1d0996c37114eaac844cbe3d39f2db..08c3ab7a70536b6fec106d21b598225f2da9369e 100644 --- a/swagger/api-table/swagger_client/models/column_dto.py +++ b/swagger/api-table/swagger_client/models/column_dto.py @@ -38,8 +38,6 @@ class ColumnDto(object): 'is_primary_key': 'bool', 'column_type': 'str', 'column_concept': 'ConceptDto', - 'decimal_digits_before': 'int', - 'decimal_digits_after': 'int', 'is_null_allowed': 'bool', 'check_expression': 'str', 'foreign_key': 'str', @@ -57,15 +55,13 @@ class ColumnDto(object): 'is_primary_key': 'is_primary_key', 'column_type': 'column_type', 'column_concept': 'column_concept', - 'decimal_digits_before': 'decimal_digits_before', - 'decimal_digits_after': 'decimal_digits_after', 'is_null_allowed': 'is_null_allowed', 'check_expression': 'check_expression', 'foreign_key': 'foreign_key', 'enum_values': 'enum_values' } - def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None): # noqa: E501 + def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None): # noqa: E501 """ColumnDto - a model defined in Swagger""" # noqa: E501 self._id = None self._name = None @@ -77,8 +73,6 @@ class ColumnDto(object): self._is_primary_key = None self._column_type = None self._column_concept = None - self._decimal_digits_before = None - self._decimal_digits_after = None self._is_null_allowed = None self._check_expression = None self._foreign_key = None @@ -97,10 +91,6 @@ class ColumnDto(object): self.column_type = column_type if column_concept is not None: self.column_concept = column_concept - if decimal_digits_before is not None: - self.decimal_digits_before = decimal_digits_before - if decimal_digits_after is not None: - self.decimal_digits_after = decimal_digits_after self.is_null_allowed = is_null_allowed if check_expression is not None: self.check_expression = check_expression @@ -339,48 +329,6 @@ class ColumnDto(object): self._column_concept = column_concept - @property - def decimal_digits_before(self): - """Gets the decimal_digits_before of this ColumnDto. # noqa: E501 - - - :return: The decimal_digits_before of this ColumnDto. # noqa: E501 - :rtype: int - """ - return self._decimal_digits_before - - @decimal_digits_before.setter - def decimal_digits_before(self, decimal_digits_before): - """Sets the decimal_digits_before of this ColumnDto. - - - :param decimal_digits_before: The decimal_digits_before of this ColumnDto. # noqa: E501 - :type: int - """ - - self._decimal_digits_before = decimal_digits_before - - @property - def decimal_digits_after(self): - """Gets the decimal_digits_after of this ColumnDto. # noqa: E501 - - - :return: The decimal_digits_after of this ColumnDto. # noqa: E501 - :rtype: int - """ - return self._decimal_digits_after - - @decimal_digits_after.setter - def decimal_digits_after(self, decimal_digits_after): - """Sets the decimal_digits_after of this ColumnDto. - - - :param decimal_digits_after: The decimal_digits_after of this ColumnDto. # noqa: E501 - :type: int - """ - - self._decimal_digits_after = decimal_digits_after - @property def is_null_allowed(self): """Gets the is_null_allowed of this ColumnDto. # noqa: E501 diff --git a/swagger/api-table/swagger_client/models/user_brief_dto.py b/swagger/api-table/swagger_client/models/user_brief_dto.py index b1a6948e55b41d14a0f10197b30a206c1bf0dc74..ed701ff11ae01e4d93dab071529b088e3c330ae9 100644 --- a/swagger/api-table/swagger_client/models/user_brief_dto.py +++ b/swagger/api-table/swagger_client/models/user_brief_dto.py @@ -110,6 +110,7 @@ class UserBriefDto(object): def username(self): """Gets the username of this UserBriefDto. # noqa: E501 + Only contains lowercase characters # noqa: E501 :return: The username of this UserBriefDto. # noqa: E501 :rtype: str @@ -120,6 +121,7 @@ class UserBriefDto(object): def username(self, username): """Sets the username of this UserBriefDto. + Only contains lowercase characters # noqa: E501 :param username: The username of this UserBriefDto. # noqa: E501 :type: str diff --git a/swagger/generate.sh b/swagger/generate.sh index 8cc5a5476879b84bda07b65a77e04c6114eb74d3..d71b1c30de4ee0a099d7e92485f9b0beae36e6b4 100755 --- a/swagger/generate.sh +++ b/swagger/generate.sh @@ -8,7 +8,6 @@ services[9093]=query services[9094]=table services[9097]=authentication services[9096]=identifier -services[9098]=metadata function retrieve () { echo "... retrieve api"