Revert "Feature 10955: Osmclient changes related to VIM configuration with a Promethe...

[osm/osmclient.git] / osmclient / cli_commands / vim.py

diff --git a/osmclient/cli_commands/vim.py b/osmclient/cli_commands/vim.py
index ff1bcc6..c6424ca 100755 (executable)
--- a/osmclient/cli_commands/vim.py
+++ b/osmclient/cli_commands/vim.py
@@ -75,16 +75,6 @@ def _check_ca_cert(vim_config: dict) -> None:
 @click.option(
     "--creds", default=None, help="credentials file (only applicable for GCP VIM type)"
 )
-@click.option(
-    "--prometheus_url",
-    default=None,
-    help="PrometheusTSBD URL to get VIM data",
-)
-@click.option(
-    "--prometheus_map",
-    default=None,
-    help="PrometheusTSBD metrics mapping for VIM data",
-)
 @click.option(
     "--prometheus_config_file",
     default=None,
@@ -107,8 +97,6 @@ def vim_create(
     wait,
     vca,
     creds,
-    prometheus_url,
-    prometheus_map,
     prometheus_config_file,
 ):
     """creates a new VIM account"""
@@ -118,17 +106,11 @@ def vim_create(
     if sdn_port_mapping:
         utils.check_client_version(ctx.obj, "--sdn_port_mapping")
     vim = {}
-    prometheus_config = {}
-    if prometheus_url:
-        prometheus_config["prometheus-url"] = prometheus_url
-    if prometheus_map:
-        prometheus_config["prometheus-map"] = prometheus_map
     if prometheus_config_file:
         with open(prometheus_config_file) as prometheus_file:
             prometheus_config_dict = json.load(prometheus_file)
-        prometheus_config.update(prometheus_config_dict)
-    if prometheus_config:
-        vim["prometheus-config"] = prometheus_config
+        vim["prometheus-config"] = prometheus_config_dict
+
     vim["vim-username"] = user
     vim["vim-password"] = password
     vim["vim-url"] = auth_url
@@ -184,16 +166,6 @@ def vim_create(
 @click.option(
     "--creds", default=None, help="credentials file (only applicable for GCP VIM type)"
 )
-@click.option(
-    "--prometheus_url",
-    default=None,
-    help="PrometheusTSBD URL to get VIM data",
-)
-@click.option(
-    "--prometheus_map",
-    default=None,
-    help="PrometheusTSBD metrics mapping for VIM data",
-)
 @click.option(
     "--prometheus_config_file",
     default=None,
@@ -216,8 +188,6 @@ def vim_update(
     sdn_port_mapping,
     wait,
     creds,
-    prometheus_url,
-    prometheus_map,
     prometheus_config_file,
 ):
     """updates a VIM account
@@ -248,17 +218,11 @@ def vim_update(
     if creds:
         with open(creds, "r") as cf:
             vim_config["credentials"] = yaml.safe_load(cf.read())
-    prometheus_config = {}
-    if prometheus_url:
-        prometheus_config["prometheus-url"] = prometheus_url
-    if prometheus_map:
-        prometheus_config["prometheus-map"] = prometheus_map
     if prometheus_config_file:
         with open(prometheus_config_file) as prometheus_file:
             prometheus_config_dict = json.load(prometheus_file)
-        prometheus_config.update(prometheus_config_dict)
-    if prometheus_config:
-        vim["prometheus-config"] = prometheus_config
+        vim["prometheus-config"] = prometheus_config_dict
+    logger.info(f"VIM: {vim}, VIM config: {vim_config}")
     ctx.obj.vim.update(
         name, vim, vim_config, sdn_controller, sdn_port_mapping, wait=wait
     )