restructure and fix router_vendor

ansible_inventory_generator/app.py

@@ -56,7 +56,7 @@ def write_hosts_file(groups: dict, hosts_file: Path) -> None:
 def generate_host_vars_and_hosts_file(router_subscriptions: list, temp_dir: Path) -> None:
     """Process router subscriptions data."""
     groups: dict[str, list[str]] = {}
-    host_vars_dir = temp_dir / "hostvars"
+    host_vars_dir = temp_dir / "host_vars"
     host_vars_dir.mkdir()
 
     for router_subscription in router_subscriptions:
@@ -67,7 +67,7 @@ def generate_host_vars_and_hosts_file(router_subscriptions: list, temp_dir: Path
 
         write_host_vars(host_name, router, host_vars_dir)
 
-        vendor_group = router.get("router_vendor", "").lower()
+        vendor_group = router.get("vendor", "").lower()
         role_group = f"{router.get('router_role', '')}_routers"
 
         groups.setdefault(vendor_group, []).append(host_name)
@@ -78,7 +78,7 @@ def generate_host_vars_and_hosts_file(router_subscriptions: list, temp_dir: Path
 
 
 @contextmanager
-def safe_write(temp_dir: Path, old_vars_dir: Path, old_hosts_file: Path) -> Generator[Path, None, None]:
+def safe_write(temp_dir: Path, old_host_vars_dir: Path) -> Generator[Path, None, None]:
     temp_dir.mkdir(exist_ok=True)
 
     try:
@@ -88,11 +88,11 @@ def safe_write(temp_dir: Path, old_vars_dir: Path, old_hosts_file: Path) -> Gene
         typer.echo(f"Error: {e}")
         sys.exit(1)
     else:
-        if old_vars_dir.exists():
-            shutil.rmtree(old_vars_dir)
+        if old_host_vars_dir.exists():
+            shutil.rmtree(old_host_vars_dir)
 
-        shutil.copytree(temp_dir, old_vars_dir)  # Copy new host vars dir
-        shutil.copy(temp_dir / "hosts.yaml", old_hosts_file)  # Copy new hosts file
+        shutil.copytree(temp_dir, old_host_vars_dir)  # Copy new host_vars dir
+        shutil.copy(temp_dir / "hosts.yaml", old_host_vars_dir)  # Copy new hosts.yaml file
         shutil.rmtree(temp_dir)
 
 
@@ -112,9 +112,8 @@ def generate_inventory_from_api() -> None:
 
     temp_dir = Path(tempfile.mkdtemp())
     old_host_vars_dir = Path(settings.host_vars_dir)
-    old_hosts_file = Path(settings.hosts_file_dir)
 
-    with safe_write(temp_dir, old_host_vars_dir, old_hosts_file) as temp_dir:
+    with safe_write(temp_dir, old_host_vars_dir) as temp_dir:
         generate_host_vars_and_hosts_file(router_subscriptions, temp_dir)