Skip to content

Complement TemplateSpec140 to VMSpec140 #2403

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
albinsun merged 1 commit into from
Jan 16, 2026
Merged

Complement TemplateSpec140 to VMSpec140 #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion apiclient/harvester_api/managers/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from harvester_api.models.templates import TemplateSpec
from harvester_api.models.templates import TemplateSpec, TemplateSpec140
from .base import DEFAULT_NAMESPACE, BaseManager


Expand Down Expand Up @@ -49,3 +49,8 @@ def delete(self, name, namespace=DEFAULT_NAMESPACE, *, raw=False):

def delete_version(self, name, namespace=DEFAULT_NAMESPACE, *, raw=False):
return self._delete(self.VER_PATH_fmt.format(uid=name, ns=namespace), raw=raw)


class TemplateManager140(TemplateManager):
support_to = "v1.4.0"
Spec = TemplateSpec140
6 changes: 5 additions & 1 deletion apiclient/harvester_api/models/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .virtualmachines import VMSpec
from .virtualmachines import VMSpec, VMSpec140


class TemplateSpec(VMSpec):
Expand Down Expand Up @@ -37,3 +37,7 @@ def from_dict(cls, data):
vd['type'] = "kubevirt.io.virtualmachine"
vd['spec']['template']['spec']['hostname'] = ""
return super().from_dict(vd)


class TemplateSpec140(TemplateSpec, VMSpec140):
pass
1 change: 0 additions & 1 deletion harvester_e2e_tests/integrations/test_4_vm_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ def stopped_vm(api_client, ssh_keypair, wait_timeout, image, unique_name):
@pytest.mark.templates
@pytest.mark.virtualmachines
class TestVMTemplate:
@pytest.mark.xfail(reason="test issue https://github.com/harvester/tests/issues/2388")
def test_create_template_with_data(
self, api_client, vm_shell_from_host, vm_checker, ssh_keypair, wait_timeout, stopped_vm
):
Expand Down