Test refactor

Makefile

@@ -2,7 +2,7 @@ ifeq (${PYTHON}, )
 override PYTHON=3.6
 endif
 
-DOCKER=docker run -p 8888:8888 -v ${PWD}:/ntc_rosetta ntc_rosetta-${PYTHON}:latest
+DOCKER=docker run -it --rm -p 8888:8888 -v ${PWD}:/ntc_rosetta ntc_rosetta-${PYTHON}:latest
 
 YANG_VENDORED_BASE_PATH=ntc_rosetta/yang
 

pyproject.toml

@@ -19,7 +19,7 @@ yangify = "^0.1.1"
 
 [tool.poetry.dev-dependencies]
 pytest = "^4.2"
-black = { version = "19.3b0", allows-prereleases = true }
+black = { version = "19.3b0", allow-prereleases = true }
 pylama = "^7.6"
 flake8-import-order = "^0.18.0"
 mypy = "^0.701.0"

tests/models/ntc/data/ntc_vlan/merge/ios/add_vlans/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/ntc/data/ntc_vlan/merge/ios/remove_vlans/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/ntc/data/ntc_vlan/parse/ios/config/test_case.py

@@ -0,0 +1,7 @@
+from tests.models.test_models import parse_path, parser
+
+
+def test_parser() -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    parser(test_data.org, test_data.model, test_data.driver, test_data.path)

tests/models/ntc/data/ntc_vlan/translate/ios/test_case_1/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, translate
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_translate(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    translate(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/description_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/description_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/mtu_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/mtu_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/subinterfaces_list_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/subinterfaces_list_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/subinterfaces_member_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/subinterfaces_member_change/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/subinterfaces_member_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/switchport_conf_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/ios/switchport_conf_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/description_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/description_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/subinterfaces_list_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/subinterfaces_list_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/subinterfaces_member_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/subinterfaces_member_change/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/subinterfaces_member_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/switchport_conf_add/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/merge/junos/switchport_conf_remove/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/parse/ios/config/test_case.py

@@ -0,0 +1,7 @@
+from tests.models.test_models import parse_path, parser
+
+
+def test_parser() -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    parser(test_data.org, test_data.model, test_data.driver, test_data.path)

tests/models/openconfig/data/openconfig_interfaces/parse/junos/config/test_case.py

@@ -0,0 +1,7 @@
+from tests.models.test_models import parse_path, parser
+
+
+def test_parser() -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    parser(test_data.org, test_data.model, test_data.driver, test_data.path)

tests/models/openconfig/data/openconfig_interfaces/translate/ios/test_case_1/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, translate
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_translate(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    translate(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/translate/ios/test_case_2/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, translate
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_translate(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    translate(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_interfaces/translate/junos/test_case_1/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, translate
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_translate(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    translate(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/add_dns_server/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/add_ntp_server/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/add_ssh_user/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/add_tacacs_server/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/remove_dns_server/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)

tests/models/openconfig/data/openconfig_system/merge/junos/remove_ntp_server/test_case.py

@@ -0,0 +1,10 @@
+from tests.models.test_models import parse_path, merge
+
+import pytest
+
+
+@pytest.mark.parametrize("action", ["merge", "replace"])  # type: ignore
+def test_merge(action: str) -> None:
+    """Run a merge test with the provided action."""
+    test_data = parse_path(__file__)
+    merge(test_data.org, test_data.driver, test_data.path, action)