Added test for uninstall cmk on kubernetes 1.7 (#175)

Author: Damenus

intel/custom_resource.py

@@ -82,13 +82,17 @@ def __init__(self, api, group, name, short_names,
             "spec": self.spec
         }
 
+        self.resource_path_crd = \
+            '/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/'
+
+        self.resource_path_crd_type = \
+            self.resource_path_crd + self.plural_name + "." + self.group
+
     def save(self):
         """Create custom resource definition spec"""
         try:
-            resource_path = \
-                '/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions'
             self.api.api_client.call_api(
-                resource_path,
+                self.resource_path_crd,
                 'POST',
                 self.header_params,
                 body=self.body,
@@ -106,17 +110,9 @@ def save(self):
 
     def exists(self, namespace="default"):
         """Check if custom resource definition exists"""
-        resource_path = "/".join([
-            "/apis",
-            self.group,
-            "v1",
-            "namespaces", namespace,
-            self.plural_name
-        ])
-
         try:
             self.api.api_client.call_api(
-                resource_path,
+                self.resource_path_crd_type,
                 'GET',
                 self.header_params,
                 auth_settings=self.auth_settings)
@@ -136,23 +132,20 @@ def create(self, name, namespace="default"):
     def remove(self):
         """Remove custom resource definitions"""
         if self.exists():
-            resource_path = "/apis/apiextensions.k8s.io/" \
-                            + "v1beta1/customresourcedefinitions/" \
-                            + self.plural_name + "." + self.group
 
             self.api.api_client.call_api(
-                resource_path,
+                self.resource_path_crd_type,
                 'DELETE',
                 self.header_params,
                 auth_settings=self.auth_settings)
 
 
 class CustomResourceDefinition:
     def __init__(self, api, resource_type, namespace, name):
-        assert (api is not None)
-        assert (resource_type is not None)
-        assert (name is not None)
-        assert (namespace is not None)
+        assert api is not None
+        assert resource_type is not None
+        assert name is not None
+        assert namespace is not None
 
         self.api = api
         self.resource_type = resource_type
@@ -216,13 +209,3 @@ def save(self):
                     raise e
 
             self.create()
-
-    def remove_all(self):
-        """Remove all object custom resource"""
-        resource_path = self.resource_path
-
-        self.api.api_client.call_api(
-            resource_path,
-            'DELETE',
-            self.resource_type.header_params,
-            auth_settings=self.resource_type.auth_settings)

intel/uninstall.py

@@ -79,29 +79,20 @@ def remove_all_report():
         remove_report_tpr("Reconcilereport")
 
 
-def remove_report_crd(report_type, short_name):
+def remove_report_crd(report_type, short_names):
     logging.info(
         "Removing \"{}\" from Kubernetes API server for node \"{}\".".format(
             report_type, os.getenv("NODE_NAME")))
     node_report_type = custom_resource.CustomResourceDefinitionType(
         k8s.extensions_client_from_config(None),
         "intel.com",
         report_type,
-        short_name
+        short_names
     )
     node_report = node_report_type.create(os.getenv("NODE_NAME"))
 
     try:
-        node_report.remove_all()
-    except K8sApiException as err:
-        if json.loads(err.body)["reason"] != "NotFound":
-            logging.error(
-                "Aborting uninstall: Exception when removing custom"
-                " resource definition \"{}\": {}".format(report_type, err))
-            sys.exit(1)
-
-        logging.warning("\"{}\" for node \"{}\" does not exist.".format(
-            report_type, os.getenv("NODE_NAME")))
+        node_report.remove()
     except K8sApiException as err:
         if json.loads(err.body)["reason"] != "NotFound":
             logging.error(

intel/util.py

@@ -25,9 +25,9 @@ def cmk_root():
 def ldh_convert_check(name):
     name_con = re.sub(r'[^-a-z0-9]', '-', name.lower())
     logging.info("Converted \"{}\" to \"{}\" for"
-                 " TPR name".format(name, name_con))
+                 " TPR/CRD name".format(name, name_con))
     if not re.fullmatch('[a-z0-9]([-a-z0-9]*[a-z0-9])?', name_con):
-        logging.error("Cant create valid TPR name using "
+        logging.error("Cant create valid TPR/CRD name using "
                       "\"{}\" - must match regex "
                       "[a-z0-9]([-a-z0-9]*[a-z0-9])?".format(name_con))
         exit(1)

tests/unit/test_uninstall.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from .. import helpers
-from intel import proc, uninstall, third_party
+from intel import custom_resource, proc, uninstall, third_party
 from kubernetes.client.rest import ApiException as K8sApiException
 import os
 import pytest
@@ -62,7 +62,50 @@ def test_uninstall_remove_node_cmk_oir_failure(caplog):
         assert caplog_tuple[-1][2] == exp_log_err
 
 
-def test_remove_report_success(caplog):
+def test_remove_all_report_tpr_success(caplog):
+    mock = MagicMock()
+    mock.remove.return_value = 0
+
+    with patch('kubernetes.config.load_incluster_config',
+               MagicMock(return_value=0)), \
+            patch('kubernetes.client.ExtensionsV1beta1Api',
+                  MagicMock(return_value=0)), \
+            patch('intel.k8s.get_kubelet_version',
+                  MagicMock(return_value=(1, 6))), \
+            patch.object(third_party.ThirdPartyResourceType,
+                         'create',
+                         MagicMock(return_value=mock)):
+        uninstall.remove_all_report()
+        caplog_tuple = caplog.record_tuples
+        assert caplog_tuple[-1][2] == "\"Reconcilereport\" for node \"{}\" " \
+                                      "removed.".format(os.getenv("NODE_NAME"))
+        assert caplog_tuple[-3][2] == "\"Nodereport\" for node \"{}\" " \
+                                      "removed.".format(os.getenv("NODE_NAME"))
+
+
+def test_remove_all_report_crd_success(caplog):
+    mock = MagicMock()
+    mock.remove.return_value = 0
+
+    with patch('kubernetes.config.load_incluster_config',
+               MagicMock(return_value=0)), \
+            patch('kubernetes.client.ExtensionsV1beta1Api',
+                  MagicMock(return_value=0)), \
+            patch('intel.k8s.get_kubelet_version',
+                  MagicMock(return_value=(1, 7))), \
+            patch.object(custom_resource.CustomResourceDefinitionType,
+                         'create',
+                         MagicMock(return_value=mock)):
+        uninstall.remove_all_report()
+        caplog_tuple = caplog.record_tuples
+        assert caplog_tuple[-1][2] == "\"cmk-reconcilereport\" for node " \
+                                      "\"{}\" removed."\
+            .format(os.getenv("NODE_NAME"))
+        assert caplog_tuple[-3][2] == "\"cmk-nodereport\" for node \"{}\" " \
+                                      "removed.".format(os.getenv("NODE_NAME"))
+
+
+def test_remove_report_tpr_success(caplog):
     fake_tpr_report = MagicMock()
     fake_tpr_report.remove.return_value = 0
 
@@ -79,7 +122,7 @@ def test_remove_report_success(caplog):
 
 
 # Remove success due to not existing report
-def test_remove_report_success2(caplog):
+def test_remove_report_tpr_success2(caplog):
     fake_http_resp = FakeHTTPResponse(500, "{\"message\":\"fake message\"}",
                                       "{\"reason\":\"NotFound\"}")
     fake_api_exception = K8sApiException(http_resp=fake_http_resp)
@@ -104,7 +147,7 @@ def test_remove_report_success2(caplog):
                                    "removed.".format(os.getenv("NODE_NAME"))
 
 
-def test_remove_report_failure(caplog):
+def test_remove_report_tpr_failure(caplog):
     fake_http_resp = FakeHTTPResponse(500, "{\"message\":\"fake message\"}",
                                       "{\"reason\":\"WrongReason\"}")
     fake_api_exception = K8sApiException(http_resp=fake_http_resp)
@@ -127,6 +170,75 @@ def test_remove_report_failure(caplog):
         assert caplog_tuple[-1][2] == exp_log_err
 
 
+def test_remove_report_crd_success(caplog):
+    fake_crd_report = MagicMock()
+    fake_crd_report.remove.return_value = 0
+
+    with patch('kubernetes.config.load_incluster_config',
+               MagicMock(return_value=0)),\
+            patch('kubernetes.client.ExtensionsV1beta1Api',
+                  MagicMock(return_value=0)), \
+            patch.object(custom_resource.CustomResourceDefinitionType,
+                         'create',
+                         MagicMock(return_value=fake_crd_report)):
+        uninstall.remove_report_crd("cmk-nodereport", ["cmk-nr"])
+        caplog_tuple = caplog.record_tuples
+        assert caplog_tuple[-1][2] == "\"cmk-nodereport\" for node \"{}\" " \
+                                      "removed.".format(os.getenv("NODE_NAME"))
+
+
+# Remove success due to not existing report
+def test_remove_report_crd_success2(caplog):
+    fake_http_resp = FakeHTTPResponse(500, "{\"message\":\"fake message\"}",
+                                      "{\"reason\":\"NotFound\"}")
+    fake_api_exception = K8sApiException(http_resp=fake_http_resp)
+
+    fake_crd_report = MagicMock()
+    fake_crd_report.remove.side_effect = fake_api_exception
+
+    with patch('kubernetes.config.load_incluster_config',
+               MagicMock(return_value=0)),\
+            patch('kubernetes.client.ExtensionsV1beta1Api',
+                  MagicMock(return_value=0)), \
+            patch.object(custom_resource.CustomResourceDefinitionType,
+                         'create',
+                         MagicMock(return_value=fake_crd_report)):
+
+        uninstall.remove_report_crd("cmk-nodereport", ["cmk-nr"])
+        caplog_tuple = caplog.record_tuples
+        assert \
+            caplog_tuple[-2][2] == "\"cmk-nodereport\" for node \"{}\" does "\
+                                   "not exist.".format(os.getenv("NODE_NAME"))
+        assert \
+            caplog_tuple[-1][2] == "\"cmk-nodereport\" for node \"{}\" " \
+                                   "removed.".format(os.getenv("NODE_NAME"))
+
+
+def test_remove_report_crd_failure(caplog):
+    fake_http_resp = FakeHTTPResponse(500, "{\"message\":\"fake message\"}",
+                                      "{\"reason\":\"WrongReason\"}")
+    fake_api_exception = K8sApiException(http_resp=fake_http_resp)
+
+    fake_crd_report = MagicMock()
+    fake_crd_report.remove.side_effect = fake_api_exception
+
+    with patch('kubernetes.config.load_incluster_config',
+               MagicMock(return_value=0)),\
+            patch('kubernetes.client.ExtensionsV1beta1Api',
+                  MagicMock(return_value=0)), \
+            patch.object(custom_resource.CustomResourceDefinitionType,
+                         'create',
+                         MagicMock(return_value=fake_crd_report)):
+        with pytest.raises(SystemExit):
+            uninstall.remove_report_crd("cmk-nodereport", ["cmk-nr"])
+        caplog_tuple = caplog.record_tuples
+        exp_err = "Aborting uninstall: " \
+                  "Exception when removing custom resource definition " \
+                  "\"cmk-nodereport\""
+        exp_log_err = get_expected_log_error(exp_err, fake_http_resp)
+        assert caplog_tuple[-1][2] == exp_log_err
+
+
 def test_uninstall_remove_node_taint_failure1(caplog):
     fake_http_resp = FakeHTTPResponse(500, "fake reason", "fake body")
     fake_api_exception = K8sApiException(http_resp=fake_http_resp)