Merge pull request #37 from d4rkstar/main

francescotimperi · web-flow · commit c19be4499773 · 2025-01-01T12:16:19.000+01:00
chore(operator): removed unused dependencies
diff --git a/nuvolaris/milvus_admin_client.py b/nuvolaris/milvus_admin_client.py
@@ -67,7 +67,7 @@ def setup_user(self, username, password,database):
 
     def remove_user(self, username, database):
         """
-        Removes a userfrom MILVUS, dropping corresponding database and roles
+        Removes a user from MILVUS, dropping corresponding database and roles
         param: username
         return: True if role has been successfully created
         """
diff --git a/tests/cron_test.ipy b/tests/cron_test.ipy
@@ -17,7 +17,6 @@
 #
 
 import nuvolaris.cronjob as cron
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 
 assert(cron.create())
diff --git a/tests/eks/config_test.ipy b/tests/eks/config_test.ipy
@@ -16,7 +16,6 @@
 # under the License.
 #
 import nuvolaris.config as cfg
-import nuvolaris.kube as kube
 
 cfg.clean()
 assert(cfg.detect_labels()['nuvolaris.kube']=="eks")
diff --git a/tests/etcd_test.ipy b/tests/etcd_test.ipy
@@ -17,14 +17,9 @@
 # under the License.
 #
 
-import nuvolaris.testutil as tu
 import nuvolaris.config as cfg
-import nuvolaris.kustomize as kus
-import nuvolaris.kube as kube
 import nuvolaris.etcd as etcd
-
-import requests as req
-import yaml, sys, os
+import nuvolaris.kube as kube
 
 cfg.clean()
 cfg.detect_labels()
diff --git a/tests/invoker_test.ipy b/tests/invoker_test.ipy
@@ -19,12 +19,11 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
+import nuvolaris.invoker as invoker
+import nuvolaris.kafka as kafka
 import nuvolaris.kube as kube
+import nuvolaris.testutil as tu
 import nuvolaris.zookeeper as zookeeper
-import nuvolaris.kafka as kafka
-import nuvolaris.invoker as invoker
-import logging
 
 # test
 assert(cfg.configure(tu.load_sample_config(name="whisk-full")))
diff --git a/tests/k3s/config_test.ipy b/tests/k3s/config_test.ipy
@@ -16,7 +16,6 @@
 # under the License.
 #
 import nuvolaris.config as cfg
-import nuvolaris.kube as kube
 
 cfg.clean()
 assert(cfg.detect_labels()['nuvolaris.kube'] == "k3s")
diff --git a/tests/k3s/ingress_test.ipy b/tests/k3s/ingress_test.ipy
@@ -16,9 +16,10 @@
 # under the License.
 #
 !kubectl config set-context --current --namespace nuvolaris
-import nuvolaris.kustomize as kus
+import requests as req
+
 import nuvolaris.kube as kube
-import requests as req, os
+import nuvolaris.kustomize as kus
 import nuvolaris.testutil as tu
 
 !kubectl -n nuvolaris delete all --all
diff --git a/tests/kafka_test.ipy b/tests/kafka_test.ipy
@@ -19,13 +19,10 @@
 %system kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
+import nuvolaris.kafka as kafka
 import nuvolaris.kube as kube
+import nuvolaris.testutil as tu
 import nuvolaris.zookeeper as zookeeper
-import nuvolaris.kafka as kafka
-import nuvolaris.couchdb as cdb
-import nuvolaris.couchdb_util as cdbu
-import logging
 
 # test
 assert(cfg.configure(tu.load_sample_config(name="whisk-full")))
diff --git a/tests/kind/action_executor_test.ipy b/tests/kind/action_executor_test.ipy
@@ -18,12 +18,11 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
-import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
-import nuvolaris.kube as kube
 import nuvolaris.actionexecutor as ae
-import nuvolaris.couchdb_util as cu
+import nuvolaris.config as cfg
 import nuvolaris.couchdb as cb
+import nuvolaris.couchdb_util as cu
+import nuvolaris.testutil as tu
 
 # init
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/config_test.ipy b/tests/kind/config_test.ipy
@@ -19,7 +19,6 @@ import nuvolaris.config as cfg
 import nuvolaris.kube as kube
 import nuvolaris.kustomize as kus
 import nuvolaris.testutil as tu
-import requests as req
 
 #print("kind")
 cfg.clean()
diff --git a/tests/kind/couchdb_compactions_test.ipy b/tests/kind/couchdb_compactions_test.ipy
@@ -19,12 +19,11 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import nuvolaris.config as cfg
 import nuvolaris.couchdb as cdb
 import nuvolaris.couchdb_util as cdbu
-import nuvolaris.testutil as tu
-import nuvolaris.config as cfg
 import nuvolaris.kube as kube
-import requests as req
+import nuvolaris.testutil as tu
 
 assert(cfg.configure(tu.load_sample_config()))
 cfg.put("couchdb.host", "localhost")
diff --git a/tests/kind/couchdb_lib_test.ipy b/tests/kind/couchdb_lib_test.ipy
@@ -19,12 +19,11 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import nuvolaris.config as cfg
 import nuvolaris.couchdb as cdb
 import nuvolaris.couchdb_util as cdbu
-import nuvolaris.testutil as tu
-import nuvolaris.config as cfg
 import nuvolaris.kube as kube
-import requests as req
+import nuvolaris.testutil as tu
 
 assert(cfg.configure(tu.load_sample_config()))
 cfg.put("couchdb.host", "localhost")
diff --git a/tests/kind/couchdb_util_test.ipy b/tests/kind/couchdb_util_test.ipy
@@ -19,10 +19,9 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
-import nuvolaris.kube as kube
 import nuvolaris.couchdb as cdb
 import nuvolaris.couchdb_util as cu
+import nuvolaris.testutil as tu
 
 !kubectl apply -f deploy/nuvolaris-permissions/nuvolaris-common.yaml
 # init
@@ -34,8 +33,6 @@ cdb.create(None)
 
 !kubectl -n nuvolaris wait --for=condition=ready pod couchdb-0
 
-
-import nuvolaris.couchdb_util 
 db = cu.CouchDB()
 
 assert(db.wait_db_ready(60))
diff --git a/tests/kind/ferretdb_test.ipy b/tests/kind/ferretdb_test.ipy
@@ -19,11 +19,10 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
-import nuvolaris.kube as kube
 import nuvolaris.ferretdb as mdb
+import nuvolaris.kube as kube
 import nuvolaris.postgres_operator as postgres
-import logging
+import nuvolaris.testutil as tu
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/milvus_standalone_test.ipy b/tests/kind/milvus_standalone_test.ipy
@@ -17,16 +17,13 @@
 # under the License.
 #
 
-import nuvolaris.testutil as tu
+import os
+
 import nuvolaris.config as cfg
-import nuvolaris.kustomize as kus
-import nuvolaris.kube as kube
-import nuvolaris.milvus_standalone as milvus
 import nuvolaris.etcd as etcd
+import nuvolaris.milvus_standalone as milvus
 import nuvolaris.minio_deploy as minio
-
-import requests as req
-import yaml, sys, os
+import nuvolaris.testutil as tu
 
 # tu.enable_debug_logging()
 # test
diff --git a/tests/kind/minio_static_test.ipy b/tests/kind/minio_static_test.ipy
@@ -18,13 +18,12 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import os
+
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.minio_deploy as minio
-import nuvolaris.util as util
 import nuvolaris.storage_static as static
-import logging
-import os
+import nuvolaris.testutil as tu
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/minio_test.ipy b/tests/kind/minio_test.ipy
@@ -18,14 +18,13 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import os
+
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 import nuvolaris.minio_deploy as minio
-import nuvolaris.couchdb as cdb
-import nuvolaris.couchdb_util as cdbu
+import nuvolaris.testutil as tu
 import nuvolaris.util as util
-import logging, os
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/minio_util_test.ipy b/tests/kind/minio_util_test.ipy
@@ -18,15 +18,13 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import os
+
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
-import nuvolaris.kube as kube
 import nuvolaris.minio_deploy as minio
-import nuvolaris.couchdb as cdb
-import nuvolaris.couchdb_util as cdbu
-import nuvolaris.util as util
 import nuvolaris.minio_util as mutil
-import logging, os
+import nuvolaris.testutil as tu
+import nuvolaris.util as util
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/mongodb_op_test.ipy b/tests/kind/mongodb_op_test.ipy
@@ -19,10 +19,9 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 import nuvolaris.mongodb as mdb
-import logging
+import nuvolaris.testutil as tu
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/mongodb_std_test.ipy b/tests/kind/mongodb_std_test.ipy
@@ -19,10 +19,9 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 import nuvolaris.mongodb as mdb
-import logging
+import nuvolaris.testutil as tu
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/mongodb_user_test.ipy b/tests/kind/mongodb_user_test.ipy
@@ -19,11 +19,9 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 import nuvolaris.mongodb as mdb
-import logging
-
+import nuvolaris.testutil as tu
 from nuvolaris.user_config import UserConfig
 from nuvolaris.user_metadata import UserMetadata
 
diff --git a/tests/kind/openwhisk_enterprise_test.ipy b/tests/kind/openwhisk_enterprise_test.ipy
@@ -18,15 +18,14 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
-import nuvolaris.couchdb as cdb
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
-import nuvolaris.kube as kube
-import nuvolaris.zookeeper as zookeeper
-import nuvolaris.kafka as kafka
+import nuvolaris.couchdb as cdb
 import nuvolaris.invoker as invoker
+import nuvolaris.kafka as kafka
+import nuvolaris.kube as kube
 import nuvolaris.openwhisk as ow
-import logging
+import nuvolaris.testutil as tu
+import nuvolaris.zookeeper as zookeeper
 
 # test
 assert(cfg.configure(tu.load_sample_config(name="whisk-full")))
diff --git a/tests/kind/postgres_op_test.ipy b/tests/kind/postgres_op_test.ipy
@@ -20,10 +20,9 @@
 !kubectl -n nuvolaris delete pvc --all
 
 import nuvolaris.config as cfg
-import nuvolaris.testutil as tu
 import nuvolaris.kube as kube
 import nuvolaris.postgres_operator as pdb
-import logging
+import nuvolaris.testutil as tu
 
 # test
 assert(cfg.configure(tu.load_sample_config()))
diff --git a/tests/kind/userdb_util_test.ipy b/tests/kind/userdb_util_test.ipy
@@ -19,15 +19,16 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
-import json, logging
+import json
+
+import nuvolaris.config as cfg
 import nuvolaris.couchdb as cdb
 import nuvolaris.couchdb_util as cdbu
-import nuvolaris.testutil as tu
-import nuvolaris.config as cfg
 import nuvolaris.kube as kube
-import nuvolaris.userdb_util as userdb
+import nuvolaris.testutil as tu
 import nuvolaris.user_config as user_config
 import nuvolaris.user_metadata as user_metadata
+import nuvolaris.userdb_util as userdb
 
 assert(cfg.configure(tu.load_sample_config()))
 assert(cfg.detect_labels()["nuvolaris.kube"] == "kind")
diff --git a/tests/kind/wskadmin.ipy b/tests/kind/wskadmin.ipy
@@ -18,11 +18,10 @@
 !kubectl -n nuvolaris delete all --all
 !kubectl -n nuvolaris delete pvc --all
 
+import nuvolaris.config as cfg
 import nuvolaris.couchdb as cdb
 import nuvolaris.couchdb_util as cu
 import nuvolaris.testutil as tu
-import nuvolaris.config as cfg
-import nuvolaris.kube as kube
 
 scf = tu.load_sample_config()
 assert(cfg.configure(scf))
diff --git a/tests/kvrocks_test.ipy b/tests/kvrocks_test.ipy
@@ -17,15 +17,10 @@
 # under the License.
 #
 
-import nuvolaris.testutil as tu
 import nuvolaris.config as cfg
-import nuvolaris.kustomize as kus
 import nuvolaris.kube as kube
 import nuvolaris.kvrocks as kvrocks
 
-import requests as req
-import yaml, sys, os
-
 cfg.clean()
 cfg.detect_labels()
 cfg.detect_storage()
diff --git a/tests/lks/config_test.ipy b/tests/lks/config_test.ipy
@@ -16,7 +16,6 @@
 # under the License.
 #
 import nuvolaris.config as cfg
-import nuvolaris.kube as kube
 
 cfg.clean()
 assert(cfg.detect_labels()['nuvolaris.kube'] == "lks")
diff --git a/tests/main_test.ipy b/tests/main_test.ipy
@@ -23,11 +23,8 @@
 # - openwhisk with couchdb and the volumes hostpath
 # - openwhisk with couchdb and the volumes 
 
-import yaml
-import nuvolaris.testutil as tu
 import nuvolaris.config as cfg
-import nuvolaris.kube as kube
-import nuvolaris.main as main 
+import nuvolaris.testutil as tu
 
 #kube.mocker.config("apply", "ok")
 cfg.configure(tu.load_sample_config())
diff --git a/tests/microk8s/config_test.ipy b/tests/microk8s/config_test.ipy
diff --git a/tests/microk8s/ingress_test.ipy b/tests/microk8s/ingress_test.ipy
diff --git a/tests/openwhisk_test.py b/tests/openwhisk_test.py
diff --git a/tests/pytorch.py b/tests/pytorch.py
diff --git a/tests/redis_test.ipy b/tests/redis_test.ipy
diff --git a/tests/redis_user_test.ipy b/tests/redis_user_test.ipy
diff --git a/tests/volume_test.ipy b/tests/volume_test.ipy
diff --git a/tests/zookeeper_test.ipy b/tests/zookeeper_test.ipy

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`#`
`18`	`18`
`19`	`19`	`import nuvolaris.cronjob as cron`
`20`		`-import nuvolaris.testutil as tu`
`21`	`20`	`import nuvolaris.kube as kube`
`22`	`21`
`23`	`22`	`assert(cron.create())`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`# under the License.`
`17`	`17`	`#`
`18`	`18`	`import nuvolaris.config as cfg`
`19`		`-import nuvolaris.kube as kube`
`20`	`19`
`21`	`20`	`cfg.clean()`
`22`	`21`	`assert(cfg.detect_labels()['nuvolaris.kube']=="eks")`