RE-211 - Update IPAM #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Extend basic to accept params (to match interface with requests and twisted)
- Extend all three transports to accept 2xx
- Extend all three transports to accept empty responses
- Update Scopegroups object with updted API
- Add Scopes and Reservations
- Add high level helpers for Scopes and Reservations
- Remove loadScopeGroupbyName
- Rename loadScopeGroupbyID to loadScopeGroup
- Add Address.reserve and Scopegroup.reserve
- Add Scopegroup.reservations
- Add Scope and Reservation
- Add tests for Scopes and Reservations
- Update tests for Scopegroups
- Updated dhcp_option functions
- Add tests for options and scopes
- Remove hardcoded test value
- Remove loadScopeGroupbyName
- Add createReservation, loadReservation, createScope and loadScope
- Add Scopes.retrieve
- Add test for Scopes.retrieve
- Make Scopes.create actually return data
- Add Scopegroup.scope and Scopegroups.create_scope
- Add Scope object
- Use scopegroup instead of scope_group
lawnmowerlatte
commented
Jun 8, 2019
| @@ -299,27 +299,16 @@ def createAddress(self, prefix, type, network_id, callback=None, errback=None, * | |||
| address = ns1.ipam.Address(self.config, prefix=prefix, type=type, network=network) | |||
| return address.create(callback=callback, errback=errback, **kwargs) | |||
|
|
|||
| def loadScopeGroupbyID(self, id, callback=None, errback=None): | |||
There was a problem hiding this comment.
Renamed to loadScopeGroup
lawnmowerlatte
commented
Jun 8, 2019
|
|
||
| :param int id: id of an existing ScopeGroup | ||
| """ | ||
| import ns1.ipam | ||
| scope_group = ns1.ipam.Scopegroup(self.config, id=id) | ||
| return scope_group.load(callback=callback, errback=errback) | ||
|
|
||
| def loadScopeGroupbyName(self, name, service_group_id, callback=None, errback=None): |
There was a problem hiding this comment.
Removed, this is no longer consistent since name is not globally unique and service group ID is not returned.
lawnmowerlatte
commented
Jun 8, 2019
| @@ -347,14 +365,7 @@ def success(result, *args): | |||
| return self | |||
|
|
|||
| if self.id is None: | |||
| if self.dhcp4 is None or self.dhcp6 is None or self.name is None or self.service_group_id is None: | |||
There was a problem hiding this comment.
Removed possibility of searching by name, ID is the only viable search criteria.
lawnmowerlatte
commented
Jun 8, 2019
| resp, | ||
| body) | ||
| # TODO make sure json is valid if there is a body | ||
| if body: |
There was a problem hiding this comment.
Required to allow 204 status code
lawnmowerlatte
commented
Jun 8, 2019
| @@ -26,7 +26,7 @@ def __init__(self, config): | |||
| TransportBase.__init__(self, config, self.__module__) | |||
| self._timeout = self._config.get('timeout', socket._GLOBAL_DEFAULT_TIMEOUT) | |||
|
|
|||
| def send(self, method, url, headers=None, data=None, files=None, | |||
| def send(self, method, url, headers=None, data=None, files=None, params=None, | |||
There was a problem hiding this comment.
Required to make basic match requests and twisted interfaces
lawnmowerlatte
commented
Jun 8, 2019
| @@ -37,7 +37,8 @@ def send(self, method, url, headers=None, data=None, params=None, files=None, | |||
| self._logHeaders(headers) | |||
| resp = self.REQ_MAP[method](url, headers=headers, verify=self._verify, | |||
| data=data, files=files, params=params, timeout=self._timeout) | |||
| if resp.status_code != 200: | |||
|
|
|||
| if resp.status_code < 200 or resp.status_code >= 300: | |||
lawnmowerlatte
commented
Jun 8, 2019
| resp.text) | ||
|
|
||
| # TODO make sure json is valid if a body is returned | ||
| if resp.text: |
There was a problem hiding this comment.
Required to allow 204
lawnmowerlatte
commented
Jun 8, 2019
| @@ -110,7 +110,7 @@ def _onBody(self, body, response, user_callback, data, headers): | |||
| response.request.absoluteURI, | |||
| response.code, | |||
| data)) | |||
| if response.code != 200: | |||
| if response.code < 200 or response.code >= 300: | |||
lawnmowerlatte
commented
Jun 8, 2019
| response, | ||
| body) | ||
|
|
||
| if body: |
There was a problem hiding this comment.
Required to allow 204
mburtless
approved these changes
Jun 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add Scopes, Scope, tests and top level helpers
Add Reservations, Reservation, tests and top level helpers
Add DHCP Option manipulators to Addresses (and tests)
Added create_scope, scopes, reserve and reservations to Scopegroups
Added reserve to Address
Use new API routes and update tests
Allow 204 responses for all transport options