From 95830eb53e0ebefaa3f7c54d88bc8ef726563485 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 12 Dec 2024 08:51:14 +0000 Subject: [PATCH 1/2] Rename repository --- README.md | 2 +- .../__init__.py | 0 .../accounting.py | 0 .../appdb.py | 0 .../data/vos.yaml | 0 .../goc.py | 0 .../site_monitor.py | 0 .../sla_monitor_cli.py | 8 ++++---- .../vm_monitor_cli.py | 4 ++-- pyproject.toml | 9 +++++---- 10 files changed, 12 insertions(+), 11 deletions(-) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/__init__.py (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/accounting.py (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/appdb.py (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/data/vos.yaml (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/goc.py (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/site_monitor.py (100%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/sla_monitor_cli.py (92%) rename {fedcloud_vm_monitoring => fedcloud_monitoring_tools}/vm_monitor_cli.py (95%) diff --git a/README.md b/README.md index f853334..52bc85e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ protocol. You can install with `pip` (it is recommended to install in a virtualenv!): ```shell -pip install -U git+https://github.com/EGI-Federation/fedcloud-vm-monitoring.git +pip install -U git+https://github.com/EGI-Federation/fedcloud-monitoring-tools.git ``` Some sites use certificates issued by certificate authorities that are not diff --git a/fedcloud_vm_monitoring/__init__.py b/fedcloud_monitoring_tools/__init__.py similarity index 100% rename from fedcloud_vm_monitoring/__init__.py rename to fedcloud_monitoring_tools/__init__.py diff --git a/fedcloud_vm_monitoring/accounting.py b/fedcloud_monitoring_tools/accounting.py similarity index 100% rename from fedcloud_vm_monitoring/accounting.py rename to fedcloud_monitoring_tools/accounting.py diff --git a/fedcloud_vm_monitoring/appdb.py b/fedcloud_monitoring_tools/appdb.py similarity index 100% rename from fedcloud_vm_monitoring/appdb.py rename to fedcloud_monitoring_tools/appdb.py diff --git a/fedcloud_vm_monitoring/data/vos.yaml b/fedcloud_monitoring_tools/data/vos.yaml similarity index 100% rename from fedcloud_vm_monitoring/data/vos.yaml rename to fedcloud_monitoring_tools/data/vos.yaml diff --git a/fedcloud_vm_monitoring/goc.py b/fedcloud_monitoring_tools/goc.py similarity index 100% rename from fedcloud_vm_monitoring/goc.py rename to fedcloud_monitoring_tools/goc.py diff --git a/fedcloud_vm_monitoring/site_monitor.py b/fedcloud_monitoring_tools/site_monitor.py similarity index 100% rename from fedcloud_vm_monitoring/site_monitor.py rename to fedcloud_monitoring_tools/site_monitor.py diff --git a/fedcloud_vm_monitoring/sla_monitor_cli.py b/fedcloud_monitoring_tools/sla_monitor_cli.py similarity index 92% rename from fedcloud_vm_monitoring/sla_monitor_cli.py rename to fedcloud_monitoring_tools/sla_monitor_cli.py index f150ab6..92af7c3 100644 --- a/fedcloud_vm_monitoring/sla_monitor_cli.py +++ b/fedcloud_monitoring_tools/sla_monitor_cli.py @@ -4,9 +4,9 @@ import click import yaml -from fedcloud_vm_monitoring.accounting import Accounting -from fedcloud_vm_monitoring.appdb import AppDB -from fedcloud_vm_monitoring.goc import GOCDB +from fedcloud_monitoring_tools.accounting import Accounting +from fedcloud_monitoring_tools.appdb import AppDB +from fedcloud_monitoring_tools.goc import GOCDB def check_site_slas(site, site_slas, goc, acct, appdb): @@ -67,7 +67,7 @@ def main( vo_map_src = f.read() else: vo_map_src = importlib.resources.read_text( - "fedcloud_vm_monitoring.data", "vos.yaml" + "fedcloud_monitoring_tools.data", "vos.yaml" ) vo_map = yaml.load(vo_map_src, Loader=yaml.SafeLoader) acct = Accounting() diff --git a/fedcloud_vm_monitoring/vm_monitor_cli.py b/fedcloud_monitoring_tools/vm_monitor_cli.py similarity index 95% rename from fedcloud_vm_monitoring/vm_monitor_cli.py rename to fedcloud_monitoring_tools/vm_monitor_cli.py index 992ca65..1ef5623 100644 --- a/fedcloud_vm_monitoring/vm_monitor_cli.py +++ b/fedcloud_monitoring_tools/vm_monitor_cli.py @@ -1,8 +1,8 @@ """Monitor VM instances running in the provider""" import click -from fedcloud_vm_monitoring.appdb import AppDB -from fedcloud_vm_monitoring.site_monitor import SiteMonitor, SiteMonitorException +from fedcloud_monitoring_tools.appdb import AppDB +from fedcloud_monitoring_tools.site_monitor import SiteMonitor, SiteMonitorException from fedcloudclient.decorators import oidc_params from fedcloudclient.sites import list_sites diff --git a/pyproject.toml b/pyproject.toml index f3c54b3..2e9961e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,17 +1,18 @@ [tool.poetry] -name = "fedcloud-vm-monitoring" +name = "fedcloud-monitoring-tools" version = "0.2.1" description = "Monitoring fedcloud VMs and sites" authors = ["Giuseppe La Rocca ", + "Sebastián Luna-Valero ", "Enol Fernandez "] readme = "README.md" include = [ - { path = "fedcloud_vm_monitoring/data", format = ["sdist", "wheel"] } + { path = "fedcloud_monitoring_tools/data", format = ["sdist", "wheel"] } ] [tool.poetry.scripts] -fedcloud-vo-monitor = "fedcloud_vm_monitoring.vm_monitor_cli:main" -fedcloud-sla-monitor = "fedcloud_vm_monitoring.sla_monitor_cli:main" +fedcloud-vo-monitor = "fedcloud_monitoring_tools.vm_monitor_cli:main" +fedcloud-sla-monitor = "fedcloud_monitoring_tools.sla_monitor_cli:main" [tool.poetry.dependencies] From b82a0a31a45083efe296c4d0d2751e23684e0ac3 Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Thu, 12 Dec 2024 08:53:09 +0000 Subject: [PATCH 2/2] Use accents --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2e9961e..9e876c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "0.2.1" description = "Monitoring fedcloud VMs and sites" authors = ["Giuseppe La Rocca ", "Sebastián Luna-Valero ", - "Enol Fernandez "] + "Enol Fernández "] readme = "README.md" include = [ { path = "fedcloud_monitoring_tools/data", format = ["sdist", "wheel"] }