Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions integration/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def create_container(self):
"config": {"limits.cpu": "2"},
"source": {"type": "image", "alias": alias},
}
result = self.lxd["containers"].post(json=machine)
result = self.lxd["instances"].post(json=machine)
operation_uuid = result.json()["operation"].split("/")[-1]
result = self.lxd.operations[operation_uuid].wait.get()

Expand All @@ -63,14 +63,14 @@ def delete_container(self, name, enforce=False):
# To ensure we don't get an infinite loop, let's count.
count = 0
try:
result = self.lxd["containers"][name].delete()
result = self.lxd["instances"][name].delete()
except exceptions.LXDAPIException as e:
if e.response.status_code in (400, 404):
return
raise
while enforce and result.status_code == 404 and count < 10:
try:
result = self.lxd["containers"][name].delete()
result = self.lxd["instances"][name].delete()
except exceptions.LXDAPIException as e:
if e.response.status_code in (400, 404):
return
Expand Down
2 changes: 1 addition & 1 deletion pylxd/models/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
class Container(Instance):
"""Flavour of :class:`models.Instance <pylxd.models.Instance>` for containers."""

_endpoint = "containers"
_endpoint = "instances"
2 changes: 1 addition & 1 deletion pylxd/models/virtual_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
class VirtualMachine(Instance):
"""Flavour of :class:`models.Instance <pylxd.models.Instance>` for VMs."""

_endpoint = "virtual-machines"
_endpoint = "instances"