[fluo-muchos] branch main updated: Import Python modules conditionally (#417)

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

arvindsh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


The following commit(s) were added to refs/heads/main by this push:
     new 81e9022  Import Python modules conditionally (#417)
81e9022 is described below

commit 81e90226f8cbb77c79dbaf6fdeaa0afe0f5f05b7
Author: Arvind Shyamsundar <ar...@apache.org>
AuthorDate: Mon Dec 6 10:09:29 2021 -0800

    Import Python modules conditionally (#417)
    
    * Fixes #416 by conditionally importing the cluster type-specific
      Python modules.
    * Updates tests to match this change.
---
 lib/muchos/config/__init__.py     | 10 ++++++----
 lib/tests/azure/test_config.py    |  2 +-
 lib/tests/ec2/test_config.py      |  2 +-
 lib/tests/existing/test_config.py |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/muchos/config/__init__.py b/lib/muchos/config/__init__.py
index 99a88b5..27ba8f4 100644
--- a/lib/muchos/config/__init__.py
+++ b/lib/muchos/config/__init__.py
@@ -15,10 +15,6 @@
 # limitations under the License.
 #
 
-from .existing import ExistingDeployConfig
-from .ec2 import Ec2DeployConfig
-from .azure import AzureDeployConfig
-
 from configparser import ConfigParser
 
 
@@ -35,6 +31,8 @@ def DeployConfig(
     cluster_type = c.get("general", "cluster_type")
 
     if cluster_type == "existing":
+        from .existing import ExistingDeployConfig
+
         return ExistingDeployConfig(
             deploy_path,
             config_path,
@@ -45,6 +43,8 @@ def DeployConfig(
         )
 
     if cluster_type == "ec2":
+        from .ec2 import Ec2DeployConfig
+
         return Ec2DeployConfig(
             deploy_path,
             config_path,
@@ -55,6 +55,8 @@ def DeployConfig(
         )
 
     if cluster_type == "azure":
+        from .azure import AzureDeployConfig
+
         return AzureDeployConfig(
             deploy_path,
             config_path,
diff --git a/lib/tests/azure/test_config.py b/lib/tests/azure/test_config.py
index 69469a3..17ecdc7 100644
--- a/lib/tests/azure/test_config.py
+++ b/lib/tests/azure/test_config.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-from muchos.config import AzureDeployConfig
+from muchos.config.azure import AzureDeployConfig
 
 
 def test_azure_cluster():
diff --git a/lib/tests/ec2/test_config.py b/lib/tests/ec2/test_config.py
index 58f1afe..4b620ac 100644
--- a/lib/tests/ec2/test_config.py
+++ b/lib/tests/ec2/test_config.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-from muchos.config import Ec2DeployConfig
+from muchos.config.ec2 import Ec2DeployConfig
 
 
 def test_ec2_cluster():
diff --git a/lib/tests/existing/test_config.py b/lib/tests/existing/test_config.py
index 1be2a86..4e2f3d6 100644
--- a/lib/tests/existing/test_config.py
+++ b/lib/tests/existing/test_config.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-from muchos.config import ExistingDeployConfig
+from muchos.config.existing import ExistingDeployConfig
 
 
 def test_existing_cluster():