Merge pull request #72 from myakove/resource-from-yaml

Support create resources from YAML file

Author: myakove

ocp_resources/catalog_source.py

@@ -11,17 +11,22 @@ class CatalogSource(NamespacedResource):
 
     def __init__(
         self,
-        name,
-        namespace,
+        name=None,
+        namespace=None,
         client=None,
         source_type=None,
         image=None,
         display_name=None,
         publisher=None,
         teardown=True,
+        yaml_file=None,
     ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
         self.source_type = source_type
         self.image = image
@@ -30,6 +35,9 @@ def __init__(
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         res.update(
             {
                 "spec": {

ocp_resources/catalog_source_config.py

@@ -14,18 +14,23 @@ class CatalogSourceConfig(NamespacedResource):
 
     def __init__(
         self,
-        name,
-        namespace,
-        source,
-        target_namespace,
-        packages,
-        cs_display_name,
-        cs_publisher,
+        name=None,
+        namespace=None,
+        source=None,
+        target_namespace=None,
+        packages=None,
+        cs_display_name=None,
+        cs_publisher=None,
         client=None,
         teardown=True,
+        yaml_file=None,
     ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
         self.source = source
         self.target_namespace = target_namespace
@@ -35,6 +40,9 @@ def __init__(
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         res.update(
             {
                 "spec": {

ocp_resources/cluster_role.py

@@ -12,20 +12,26 @@ class ClusterRole(Resource):
 
     def __init__(
         self,
-        name,
+        name=None,
         client=None,
         api_groups=None,
         permissions_to_resources=None,
         verbs=None,
         teardown=True,
+        yaml_file=None,
     ):
-        super().__init__(client=client, name=name, teardown=teardown)
+        super().__init__(
+            client=client, name=name, teardown=teardown, yaml_file=yaml_file
+        )
         self.api_groups = api_groups
         self.permissions_to_resources = permissions_to_resources
         self.verbs = verbs
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         rules = {}
         if self.api_groups:
             rules["apiGroups"] = self.api_groups

ocp_resources/configmap.py

@@ -8,13 +8,28 @@ class ConfigMap(NamespacedResource):
 
     api_version = NamespacedResource.ApiVersion.V1
 
-    def __init__(self, name, namespace, data=None, teardown=True, client=None):
+    def __init__(
+        self,
+        name=None,
+        namespace=None,
+        data=None,
+        teardown=True,
+        client=None,
+        yaml_file=None,
+    ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
         self.data = data
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         res.setdefault("data", {}).update(self.data)
         return res

ocp_resources/datavolume.py

@@ -66,8 +66,8 @@ class Status(Resource.Condition.Status):
 
     def __init__(
         self,
-        name,
-        namespace,
+        name=None,
+        namespace=None,
         source=None,
         size=None,
         storage_class=None,
@@ -86,13 +86,15 @@ def __init__(
         preallocation=None,
         teardown=True,
         privileged_client=None,
+        yaml_file=None,
     ):
         super().__init__(
             name=name,
             namespace=namespace,
             client=client,
             teardown=teardown,
             privileged_client=privileged_client,
+            yaml_file=yaml_file,
         )
         self.source = source
         self.url = url
@@ -112,6 +114,9 @@ def __init__(
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         res.update(
             {
                 "spec": {

ocp_resources/hostpath_provisioner.py

@@ -14,14 +14,25 @@ class Name:
         HOSTPATH_PROVISIONER = "hostpath-provisioner"
 
     def __init__(
-        self, name, path=None, image_pull_policy=None, client=None, teardown=True
+        self,
+        name=None,
+        path=None,
+        image_pull_policy=None,
+        client=None,
+        teardown=True,
+        yaml_file=None,
     ):
-        super().__init__(name=name, client=client, teardown=teardown)
+        super().__init__(
+            name=name, client=client, teardown=teardown, yaml_file=yaml_file
+        )
         self.path = path
         self.image_pull_policy = image_pull_policy
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         spec = res.setdefault("spec", {})
         path_config = spec.setdefault("pathConfig", {})
         if self.path:

ocp_resources/hyperconverged.py

@@ -6,21 +6,28 @@ class HyperConverged(NamespacedResource):
 
     def __init__(
         self,
-        name,
-        namespace,
+        name=None,
+        namespace=None,
         client=None,
         infra=None,
         workloads=None,
         teardown=True,
+        yaml_file=None,
     ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
         self.infra = infra
         self.workloads = workloads
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
 
         if self.infra:
             res.setdefault("spec", {}).setdefault("infra", {}).update(self.infra)

ocp_resources/kube_descheduler.py

@@ -6,15 +6,16 @@ class KubeDescheduler(NamespacedResource):
 
     def __init__(
         self,
-        name,
-        namespace,
-        profiles=["AffinityAndTaints"],
+        name=None,
+        namespace=None,
+        profiles=None,
         descheduling_interval=3600,
         log_level="Normal",
         managemet_state="Managed",
         operator_log_level="Normal",
         teardown=True,
         client=None,
+        yaml_file=None,
     ):
         """
         Create Descheduler object.
@@ -28,16 +29,23 @@ def __init__(
             operator_log_level (str): logging of an operator. Supported: "Normal", "Debug", "Trace", "TraceAll"
         """
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
-        self.profiles = profiles
+        self.profiles = profiles or ["AffinityAndTaints"]
         self.descheduling_interval = descheduling_interval
         self.log_level = log_level
         self.managemet_state = managemet_state
         self.operator_log_level = operator_log_level
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         res.update(
             {
                 "spec": {

ocp_resources/machine.py

@@ -8,9 +8,15 @@ class Machine(NamespacedResource):
 
     api_group = NamespacedResource.ApiGroup.MACHINE_OPENSHIFT_IO
 
-    def __init__(self, name, namespace, teardown=True, client=None):
+    def __init__(
+        self, name=None, namespace=None, teardown=True, client=None, yaml_file=None
+    ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
 
     @property

ocp_resources/machine_health_check.py

@@ -10,10 +10,10 @@ class MachineHealthCheck(NamespacedResource):
 
     def __init__(
         self,
-        name,
-        namespace,
-        cluster_name,
-        machineset_name,
+        name=None,
+        namespace=None,
+        cluster_name=None,
+        machineset_name=None,
         client=None,
         machine_role="worker",
         machine_type="worker",
@@ -22,9 +22,14 @@ def __init__(
         unhealthy_timeout="300s",
         reboot_strategy=False,
         teardown=True,
+        yaml_file=None,
     ):
         super().__init__(
-            name=name, namespace=namespace, client=client, teardown=teardown
+            name=name,
+            namespace=namespace,
+            client=client,
+            teardown=teardown,
+            yaml_file=yaml_file,
         )
         self.cluster_name = cluster_name
         self.machineset_name = machineset_name
@@ -37,6 +42,9 @@ def __init__(
 
     def to_dict(self):
         res = super().to_dict()
+        if self.yaml_file:
+            return res
+
         if self.reboot_strategy:
             res["metadata"]["annotations"] = {
                 f"{self.api_group}/remediation-strategy": "external-baremetal"