Skip to content

Add multiple servers support to Python client #1969

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wing328 merged 16 commits into from
Jan 28, 2019
Merged

Add multiple servers support to Python client #1969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea5397c
add multiple server support to python client
wing328 Jan 23, 2019
b14fb18
various fixes
wing328 Jan 23, 2019
fc59ad9
minor fixes, add tests
wing328 Jan 23, 2019
5700027
test oas2 python first
wing328 Jan 23, 2019
0a29615
fix tests
wing328 Jan 23, 2019
41f64a7
fix issues reported by flake8
wing328 Jan 24, 2019
4d2ccd4
update code format
wing328 Jan 24, 2019
38def2d
add python petstore to ensure up-to-date
wing328 Jan 24, 2019
e98a2de
rearrange test
wing328 Jan 24, 2019
3b539ec
fix E501
wing328 Jan 24, 2019
7246e9f
fix tests
wing328 Jan 24, 2019
cb3301f
add new files
wing328 Jan 24, 2019
cfa78f5
fix script permission
wing328 Jan 25, 2019
138a9ce
fix index check
wing328 Jan 27, 2019
05061cf
Merge branch 'python_multiple_server' of https://github.com/openapito…
wing328 Jan 27, 2019
15d0210
update samples
wing328 Jan 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
various fixes
  • Loading branch information
@wing328
wing328 committed Jan 23, 2019
commit b14fb18dc2b0e18a330d17bc1201a9e0ab10d081
9 changes: 4 additions & 5 deletions modules/openapi-generator/src/main/resources/python/configuration.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
:return: URL based on host settings
"""

servers = get_host_settings
servers = self.get_host_settings()

# check array index out of bound
if index < 0 or index > len(servers):
Copy link
Member

@tomplus tomplus Jan 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the second expression should be >=

Copy link
Member Author

@wing328 wing328 Jan 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Just pushed out a fix.

Copy link
Member Author

@wing328 wing328 Jan 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI. I'm also reviewing other clients and filing a fix accordingly if the same issue is found.

Expand All @@ -301,14 +301,13 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):

# go through variable and assign a value
for variable_name in server['variables']:
if name in variables[varible_name]:
if variable_name in variables:
if variables[variable_name] in variables[variable_name]['enum_values']:
url = url.replace("{" + variable_name + "}", variables[variable_name])
else:
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values'])
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values']) # noqa: E501
else:
# use default value
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value'])
end
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value']) # noqa: E501

return url
9 changes: 4 additions & 5 deletions samples/client/petstore/python/petstore_api/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def get_host_from_settings(self, index, variables={}):
:return: URL based on host settings
"""

servers = get_host_settings
servers = self.get_host_settings()

# check array index out of bound
if index < 0 or index > len(servers):
Expand All @@ -289,14 +289,13 @@ def get_host_from_settings(self, index, variables={}):

# go through variable and assign a value
for variable_name in server['variables']:
if name in variables[varible_name]:
if variable_name in variables:
if variables[variable_name] in variables[variable_name]['enum_values']:
url = url.replace("{" + variable_name + "}", variables[variable_name])
else:
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values'])
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values']) # noqa: E501
else:
# use default value
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value'])
end
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value']) # noqa: E501

return url
9 changes: 4 additions & 5 deletions samples/openapi3/client/petstore/python/petstore_api/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def get_host_from_settings(self, index, variables={}):
:return: URL based on host settings
"""

servers = get_host_settings
servers = self.get_host_settings()

# check array index out of bound
if index < 0 or index > len(servers):
Expand All @@ -322,14 +322,13 @@ def get_host_from_settings(self, index, variables={}):

# go through variable and assign a value
for variable_name in server['variables']:
if name in variables[varible_name]:
if variable_name in variables:
if variables[variable_name] in variables[variable_name]['enum_values']:
url = url.replace("{" + variable_name + "}", variables[variable_name])
else:
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values'])
raise ValueError("The variable `%s` in the host URL has invalid value %s. Must be %s." % variable_name % variables[variable_name] % variables[variable_name]['enum_values']) # noqa: E501
else:
# use default value
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value'])
end
url = url.replace("{" + variable_name + "}", variables[variable_name]['default_value']) # noqa: E501

return url