commit 0a3cee20d28824aeca5ef5afce2b83bdb31222d6
author vegall <lvega@whitestack.com> Wed Apr 27 15:56:04 2022 +0000
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Wed May 18 10:49:25 2022 +0200
tree 58f4ffea39fe1d1be8edf5da4451b3d7208affe4
parent 8f4936bbd22fc700b9d1e64eb6b056bf7744b0a4

Feature 10920: Monitoring of NFVI-leve VNF metrics form Prometheus TSDB

Change-Id: Id1c9782735de51b5348b8930de9c4cdd5d81f406
Signed-off-by: vegall <lvega@whitestack.com>

osmclient/scripts/osm.py

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 58b34c5..3ce02df 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -3154,6 +3154,7 @@
 )
 @click.option("--vca", default=None, help="VCA to be used in this VIM account")
 @click.option("--creds", default=None, help="credentials file (only applycable for GCP VIM type)")
+@click.option("--prometheus_config_file", default=None, help="Prometheus configuration to get VIM data")
 @click.pass_context
 def vim_create(
     ctx,
@@ -3171,6 +3172,7 @@
     wait,
     vca,
     creds,
+    prometheus_config_file
 ):
     """creates a new VIM account"""
     logger.debug("")
@@ -3180,6 +3182,11 @@
     if sdn_port_mapping:
         check_client_version(ctx.obj, "--sdn_port_mapping")
     vim = {}
+    if prometheus_config_file:
+        with open(prometheus_config_file) as prometheus_file:
+            prometheus_config_dict = json.load(prometheus_file)
+        vim["prometheus-config"] = prometheus_config_dict
+
     vim["vim-username"] = user
     vim["vim-password"] = password
     vim["vim-url"] = auth_url
@@ -3229,6 +3236,7 @@
     "until the operation is completed, or timeout",
 )
 @click.option("--creds", default=None, help="credentials file (only applycable for GCP VIM type)")
+@click.option("--prometheus_config_file", default=None, help="Prometheus configuration to get VIM data")
 @click.pass_context
 def vim_update(
     ctx,
@@ -3246,6 +3254,7 @@
     sdn_port_mapping,
     wait,
     creds,
+    prometheus_config_file
 ):
     """updates a VIM account
 
@@ -3275,6 +3284,10 @@
     if creds:
         with open(creds, "r") as cf:
             vim_config["credentials"] = yaml.safe_load(cf.read())
+    if prometheus_config_file:
+        with open(prometheus_config_file) as prometheus_file:
+            prometheus_config_dict = json.load(prometheus_file)
+        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)
     # except ClientException as e: