airship
/
drydock
Code Issues Proposed changes

Change MAAS api endpoints according to v3.0.0 

Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Change-Id: I9daa8b5b8d76f2da939ce0dffdb3471ba7cd8947
This commit is contained in:
Ruslan Aliev 2023-03-05 04:19:38 -06:00
parent b431f7a2cf
commit e4f15ff048
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/drydock_provisioner/drivers/node/maasdriver/models/iprange.py
View File

@ -18,7 +18,7 @@ import drydock_provisioner.drivers.node.maasdriver.models.base as model_base
class IpRange(model_base.ResourceBase):
resource_url = 'iprange/{resource_id}/'
resource_url = 'ipranges/{resource_id}/'
fields = ['resource_id', 'comment', 'subnet', 'type', 'start_ip', 'end_ip']
json_fields = ['comment', 'start_ip', 'end_ip']

2
python/drydock_provisioner/drivers/node/maasdriver/models/machine.py
View File

@ -376,7 +376,7 @@ class Machine(model_base.ResourceBase):
url = self.interpolate_url()
resp = self.api_client.post(
url, op='set_owner_data', files={key: value})
url, op='set_workload_annotations', files={key: value})
if resp.status_code != 200:
self.logger.error(

2
python/drydock_provisioner/drivers/node/maasdriver/models/node_results.py
View File

@ -20,7 +20,7 @@ import drydock_provisioner.drivers.node.maasdriver.models.base as model_base
class NodeResult(model_base.ResourceBase):
resource_url = 'commissioning-results/'
resource_url = 'installation-results/'
fields = [
'resource_id', 'name', 'result_type', 'updated', 'data',
'script_result'

6
tox.ini
View File

@ -5,7 +5,7 @@ setupdir=python/
[testenv]
setenv = YAMLDIR = {toxinidir}/python/tests/yaml_samples/
basepython=python3
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY
deps=
-rpython/requirements-lock.txt
-rpython/requirements-test.txt
@ -48,7 +48,7 @@ commands=
[testenv:integration]
basepython=python3.5
passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
passenv=DOCKER_REGISTRY,IMAGE_NAME,IMAGE_PREFIX,IMAGE_TAG
setenv=
PYTHONWARNING=all
YAMLDIR={toxinidir}/python/tests/yaml_samples/
@ -60,7 +60,7 @@ commands=
[testenv:cover]
basepython=python3
usedevelop=True
passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
passenv=DOCKER_REGISTRY,IMAGE_NAME,IMAGE_PREFIX,IMAGE_TAG
setenv=
YAMLDIR={toxinidir}/python/tests/yaml_samples/
commands=