Test import (#81)

* fix imports

* Prepare release nebius-vpngw-v0.5.3

Author: bahmanzadeh

services/vpngw/CHANGELOG.md

@@ -14,6 +14,10 @@ All notable changes to this project are tracked here. This changelog follows
 
 ## [Unreleased]
 
+## [nebius-vpngw-v0.5.3] - 2026-03-10
+
+- Made the output path optional for `create-from-peer-config`; when omitted, the generated config now defaults to `./nebius-vpngw.config.yaml`.
+- Added `--local-config-file` as an output-file alias for `create-from-peer-config`, with fail-fast validation if it conflicts with the positional output path.
 ## [nebius-vpngw-v0.5.2] - 2026-03-08
 
 - Expanded the pytest-based test suite, split unit/integration coverage, centralized test config in `pyproject.toml`, and added `Makefile` targets plus service-scoped CI.

services/vpngw/README.md

@@ -549,6 +549,14 @@ nebius-vpngw create-from-peer-config my-vpn.config.yaml \
   --peer-config-file branch-office.csv
 ```
 
+Or use the output-path flag form:
+
+```bash
+nebius-vpngw create-from-peer-config \
+  --peer-config-file gcp-peer.txt \
+  --local-config-file my-vpn.config.yaml
+```
+
 If the generated output already matches the existing file, rerunning the command
 is a no-op and exits successfully.
 
@@ -977,6 +985,9 @@ nebius-vpngw create-from-peer-config nebius-vpn.config.yaml \
   --peer-config-file gcp-peer.txt
 ```
 
+If you omit both `CONFIG_FILE` and `--local-config-file`, the command writes `./nebius-vpngw.config.yaml`.
+`--local-config-file` is accepted as an output-path alias on this command.
+
 `create-from-peer-config` now builds `connections:` from parsed peer specs instead of reusing the template's fixed sample topology. The generated file is validated against the schema before it is written.
 
 ### Keyword Matching
@@ -1034,6 +1045,14 @@ nebius-vpngw create-from-peer-config gcp-ha-vpn.config.yaml \
   --peer-config-file gcp-peer.txt
 ```
 
+Equivalent flag form:
+
+```bash
+nebius-vpngw create-from-peer-config \
+  --peer-config-file gcp-peer.txt \
+  --local-config-file gcp-ha-vpn.config.yaml
+```
+
 **3. Generated BGP target shape (review and adjust values before deploy):**
 
 ```yaml

services/vpngw/src/nebius_vpngw/cli.py

@@ -1350,8 +1350,21 @@ def prep_network(
 
 @app.command(options_metavar="")
 def create_from_peer_config(
-    config_file: Path = typer.Argument(
-        ..., help="Path for new configuration file (recommended: *.config.yaml)"
+    config_file: Path | None = typer.Argument(
+        None,
+        help=(
+            "Path for new configuration file "
+            f"(default: ./{DEFAULT_CONFIG_FILENAME}; recommended: *.config.yaml)"
+        ),
+    ),
+    local_config_file: Path | None = typer.Option(
+        None,
+        "--local-config-file",
+        "-c",
+        help=(
+            "Output local config file path. "
+            "Alias for CONFIG_FILE on this command."
+        ),
     ),
     peer_config_file: list[Path] = typer.Option(
         ...,
@@ -1377,6 +1390,22 @@ def create_from_peer_config(
 
     console = Console()
 
+    if config_file is not None and local_config_file is not None and config_file != local_config_file:
+        console.print()
+        console.print(
+            Panel.fit(
+                "[bold red]✗ Conflicting output file arguments[/bold red]\n\n"
+                f"CONFIG_FILE: [cyan]{config_file}[/cyan]\n"
+                f"--local-config-file: [cyan]{local_config_file}[/cyan]\n\n"
+                "Provide only one output path, or pass the same value to both.",
+                title="[red]Error[/red]",
+                border_style="red",
+            )
+        )
+        raise typer.Exit(code=1)
+
+    config_file = local_config_file or config_file or (Path.cwd() / DEFAULT_CONFIG_FILENAME)
+
     if not peer_config_file:
         console.print(
             Panel.fit(

services/vpngw/tests/unit/test_peer_importer.py

@@ -6,7 +6,7 @@
 import yaml
 from typer.testing import CliRunner
 
-from nebius_vpngw.cli import app
+from nebius_vpngw.cli import DEFAULT_CONFIG_FILENAME, app
 from nebius_vpngw.config_loader import build_config_from_peer_files
 from nebius_vpngw.config_template import DEFAULT_CONFIG_TEMPLATE
 from nebius_vpngw.peer_parsers import parse_peer_source
@@ -150,3 +150,126 @@ def test_create_from_peer_config_generates_bgp_config_from_csv(tmp_path: Path) -
         "nebius-primary",
         "nebius-secondary",
     ]
+
+
+def test_create_from_peer_config_defaults_output_path(tmp_path: Path, monkeypatch) -> None:
+    peer_file = tmp_path / "gcp-peer.yaml"
+    peer_file.write_text(
+        yaml.safe_dump(
+            {
+                "name": "gcp-ha-vpn",
+                "vendor": "gcp",
+                "routing_mode": "bgp",
+                "remote_asn": 65014,
+                "tunnels": [
+                    {
+                        "name": "nebius-primary",
+                        "remote_public_ip": "34.157.15.187",
+                        "psk": "cli-psk-1",
+                        "inner_local_ip": "169.254.10.1",
+                        "inner_remote_ip": "169.254.10.2",
+                    }
+                ],
+            },
+            sort_keys=False,
+        ),
+        encoding="utf-8",
+    )
+    monkeypatch.chdir(tmp_path)
+
+    result = CliRunner().invoke(
+        app,
+        [
+            "create-from-peer-config",
+            "--peer-config-file",
+            str(peer_file),
+        ],
+    )
+
+    assert result.exit_code == 0, result.stdout
+
+    output_file = tmp_path / DEFAULT_CONFIG_FILENAME
+    generated = yaml.safe_load(output_file.read_text(encoding="utf-8"))
+    assert len(generated["connections"]) == 1
+    connection = generated["connections"][0]
+    assert connection["name"] == "gcp-ha-vpn"
+    assert connection["vendor"] == "gcp"
+    assert connection["bgp"]["remote_asn"] == 65014
+
+
+def test_create_from_peer_config_accepts_local_config_file_alias(tmp_path: Path) -> None:
+    peer_file = tmp_path / "gcp-peer.yaml"
+    peer_file.write_text(
+        yaml.safe_dump(
+            {
+                "name": "gcp-ha-vpn",
+                "vendor": "gcp",
+                "routing_mode": "bgp",
+                "remote_asn": 65014,
+                "tunnels": [
+                    {
+                        "name": "nebius-primary",
+                        "remote_public_ip": "34.157.15.187",
+                        "psk": "cli-psk-1",
+                        "inner_local_ip": "169.254.10.1",
+                        "inner_remote_ip": "169.254.10.2",
+                    }
+                ],
+            },
+            sort_keys=False,
+        ),
+        encoding="utf-8",
+    )
+    output_file = tmp_path / "example.config.yaml"
+
+    result = CliRunner().invoke(
+        app,
+        [
+            "create-from-peer-config",
+            "--peer-config-file",
+            str(peer_file),
+            "--local-config-file",
+            str(output_file),
+        ],
+    )
+
+    assert result.exit_code == 0, result.stdout
+
+    generated = yaml.safe_load(output_file.read_text(encoding="utf-8"))
+    assert len(generated["connections"]) == 1
+    connection = generated["connections"][0]
+    assert connection["name"] == "gcp-ha-vpn"
+    assert connection["vendor"] == "gcp"
+    assert connection["bgp"]["remote_asn"] == 65014
+
+
+def test_create_from_peer_config_rejects_conflicting_output_paths(tmp_path: Path) -> None:
+    peer_file = tmp_path / "gcp-peer.yaml"
+    peer_file.write_text(
+        yaml.safe_dump(
+            {
+                "name": "gcp-ha-vpn",
+                "vendor": "gcp",
+                "tunnels": [{"remote_public_ip": "34.157.15.187"}],
+            },
+            sort_keys=False,
+        ),
+        encoding="utf-8",
+    )
+    positional_output = tmp_path / "positional.config.yaml"
+    option_output = tmp_path / "option.config.yaml"
+
+    result = CliRunner().invoke(
+        app,
+        [
+            "create-from-peer-config",
+            str(positional_output),
+            "--peer-config-file",
+            str(peer_file),
+            "--local-config-file",
+            str(option_output),
+        ],
+    )
+
+    assert result.exit_code == 1, result.stdout
+    assert "Conflicting output file arguments" in result.stdout