import errors fix

Author: DiptoChakrabarty

kubernetes/e2e_test/test_utils.py

@@ -181,7 +181,7 @@ def test_create_apiservice_from_yaml_with_conflict(self):
         svc = reg_api.read_api_service(
             name="v1alpha1.wardle.k8s.io")
         self.assertIsNotNone(svc)
-        with self.assertRaises(utils.FailToCreateError) as cm:
+        with self.assertRaises(utils.FailToExecuteError) as cm:
             utils.create_from_yaml(
                 k8s_client, "kubernetes/e2e_test/test_yaml/api-service.yaml")
         exp_error = ('Error from server (Conflict): '
@@ -243,7 +243,7 @@ def test_create_implicit_service_list_from_yaml_with_conflict(self):
         json file that implicitly indicates the kind of individual objects
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
-        with self.assertRaises(utils.FailToCreateError):
+        with self.assertRaises(utils.FailToExecuteError):
             utils.create_from_yaml(
                 k8s_client, self.path_prefix + "implicit-svclist.json")
         core_api = client.CoreV1Api(k8s_client)
@@ -320,7 +320,7 @@ def test_create_from_multi_resource_yaml_with_conflict(self):
         svc = core_api.read_namespaced_service(name="mock-2",
                                                namespace="default")
         self.assertIsNotNone(svc)
-        with self.assertRaises(utils.FailToCreateError) as cm:
+        with self.assertRaises(utils.FailToExecuteError) as cm:
             utils.create_from_yaml(
                 k8s_client, self.path_prefix + "yaml-conflict-multi.yaml")
         exp_error = ('Error from server (Conflict): {"kind":"Status",'
@@ -345,7 +345,7 @@ def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
         Should raise an exception that contains two error messages.
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
-        with self.assertRaises(utils.FailToCreateError) as cm:
+        with self.assertRaises(utils.FailToExecuteError) as cm:
             utils.create_from_yaml(
                 k8s_client, self.path_prefix + "triple-nginx.yaml")
         exp_error = ('Error from server (Conflict): {"kind":"Status",'

kubernetes/utils/__init__.py

@@ -14,10 +14,6 @@
 
 from __future__ import absolute_import
 
-#from .create_from_yaml import (FailToCreateError, create_from_dict,
-#                               create_from_yaml)
-#from .delete_from_yaml import (FailToDeleteError, delete_from_dict,
-#                               delete_from_yaml)
-from .operate_from_yaml import (FailToExecuteError, create_from_yaml,
-                                delete_from_yaml)
+from .operate_from_yaml import (FailToExecuteError, create_from_dict, delete_from_dict,
+                                create_from_yaml, delete_from_yaml)
 from .quantity import parse_quantity