From c286f6327b6683053f0e1afe65a84fdca21e9eb7 Mon Sep 17 00:00:00 2001 From: rnetser Date: Mon, 2 Aug 2021 20:40:09 +0300 Subject: [PATCH 1/2] Add ApiGroup VM_KUBEVIRT_IO --- ocp_resources/template.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ocp_resources/template.py b/ocp_resources/template.py index d1890bfe24..5d962b4d3f 100644 --- a/ocp_resources/template.py +++ b/ocp_resources/template.py @@ -1,6 +1,6 @@ import json -from ocp_resources.resource import NamespacedResource +from ocp_resources.resource import NamespacedResource, Resource class Template(NamespacedResource): @@ -34,6 +34,11 @@ class Annotations: f"{NamespacedResource.ApiGroup.TEMPLATE_KUBEVIRT_IO}/provider-url" ) + class VMAnnotations: + OS = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/os" + FLAVOR = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/flavor" + WORKLOAD = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/workload" + def process(self, client=None, **kwargs): client = client or self.client instance_dict = self.instance.to_dict() From 4efb9acc4952170026c85b56bb4bd541f93719df Mon Sep 17 00:00:00 2001 From: rnetser Date: Sun, 22 Aug 2021 14:46:57 +0300 Subject: [PATCH 2/2] Add vm annotations --- ocp_resources/resource.py | 1 + ocp_resources/template.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ocp_resources/resource.py b/ocp_resources/resource.py index 0f3bf49cb6..1da52ab736 100644 --- a/ocp_resources/resource.py +++ b/ocp_resources/resource.py @@ -296,6 +296,7 @@ class ApiGroup: TEMPLATE_OPENSHIFT_IO = "template.openshift.io" UPLOAD_CDI_KUBEVIRT_IO = "upload.cdi.kubevirt.io" V2V_KUBEVIRT_IO = "v2v.kubevirt.io" + VM_KUBEVIRT_IO = "vm.kubevirt.io" class ApiVersion: V1 = "v1" diff --git a/ocp_resources/template.py b/ocp_resources/template.py index 5d962b4d3f..c76a426715 100644 --- a/ocp_resources/template.py +++ b/ocp_resources/template.py @@ -1,6 +1,6 @@ import json -from ocp_resources.resource import NamespacedResource, Resource +from ocp_resources.resource import NamespacedResource class Template(NamespacedResource): @@ -35,9 +35,9 @@ class Annotations: ) class VMAnnotations: - OS = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/os" - FLAVOR = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/flavor" - WORKLOAD = f"{Resource.ApiGroup.VM_KUBEVIRT_IO}/workload" + OS = f"{NamespacedResource.ApiGroup.VM_KUBEVIRT_IO}/os" + FLAVOR = f"{NamespacedResource.ApiGroup.VM_KUBEVIRT_IO}/flavor" + WORKLOAD = f"{NamespacedResource.ApiGroup.VM_KUBEVIRT_IO}/workload" def process(self, client=None, **kwargs): client = client or self.client