devaci 1.0.0__tar.gz → 1.0.1__tar.gz

{devaci-1.0.0 → devaci-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: devaci
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python library that generates Cisco ACI configuration and optionally pushes it to an APIC controller via Cisco's official Cobra SDK.
 Project-URL: Homepage, https://github.com/cocuni80/devaci
 Project-URL: Repository, https://github.com/cocuni80/devaci

{devaci-1.0.0 → devaci-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "devaci"
-version = "1.0.0"
+version = "1.0.1"
 description = "Python library that generates Cisco ACI configuration and optionally pushes it to an APIC controller via Cisco's official Cobra SDK."
 readme = "README.md"
 requires-python = ">=3.10"

{devaci-1.0.0 → devaci-1.0.1}/src/devaci/cobra/__init__.py

@@ -40,12 +40,16 @@ class CobraBuilder:
 
     @property
     def xml(self) -> str | None:
-        """Return the rendered XML payload."""
+        """Return the rendered XML payload, or None when the config is empty."""
+        if not self.config.configMos:
+            return None
         return cast(str | None, self.config.xmldata)
 
     @property
     def json(self) -> Any:
-        """Return the rendered JSON payload as a dict."""
+        """Return the rendered JSON payload as a dict, or None when the config is empty."""
+        if not self.config.configMos:
+            return None
         return json.loads(self.config.data)
 
     def render(self, output: dict[str, Any]) -> CobraResult:

{devaci-1.0.0 → devaci-1.0.1}/src/devaci/deploy.py

@@ -120,7 +120,7 @@ class DeployClass:
 
         try:
             renderer = JinjaRenderer()
-            output = renderer.render(content, name=name, **self._variables)
+            output = renderer.render(content, **self._variables)
             logs.append(f"[Jinja]: Template {name} was rendered successfully.")
             logger.info(logs[-1])
 

{devaci-1.0.0 → devaci-1.0.1}/src/devaci/jinja.py

@@ -26,7 +26,7 @@ class JinjaRenderer:
         self._env.filters["range"] = range_filter
         self._env.filters["nan"] = nan_filter
 
-    def render(self, template: str, name: str | None = None, **variables: Any) -> dict[str, Any]:
+    def render(self, template: str, **variables: Any) -> dict[str, Any]:
         """Render ``template`` with ``variables`` and parse the YAML output."""
         try:
             rendered = self._env.from_string(template).render(**variables)
@@ -36,7 +36,5 @@ class JinjaRenderer:
 
         output = load_yaml(rendered)
         if not isinstance(output, dict):
-            raise JinjaError(
-                f"[Jinja] -> [ConfigError]: Template {name} did not produce a mapping."
-            )
+            raise JinjaError("[Jinja] -> [ConfigError]: Template did not produce a mapping.")
         return output

{devaci-1.0.0 → devaci-1.0.1}/src/devaci/results.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import json
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Any
+from typing import Any, cast
 
 
 def _timestamp() -> str:
@@ -44,11 +44,15 @@ class CobraResult(Result):
 
     @property
     def xml(self) -> str | None:
-        return self.config.xmldata if self.config is not None else None
+        if self.config is None or not self.config.configMos:
+            return None
+        return cast(str | None, self.config.xmldata)
 
     @property
     def json(self) -> Any:
-        return json.loads(self.config.data) if self.config is not None else None
+        if self.config is None or not self.config.configMos:
+            return None
+        return json.loads(self.config.data)
 
     def to_dict(self) -> dict[str, Any]:
         data = super().to_dict()

{devaci-1.0.0 → devaci-1.0.1}/tests/test_deploy.py

@@ -83,3 +83,16 @@ def test_deploy_save_output(tmp_path):
     output = tmp_path / "scripts" / "config.xml"
     assert output.exists()
     assert "acme" in output.read_text(encoding="utf-8")
+
+
+def test_deploy_variable_named_name(tmp_path):
+    aci = DeployClass(testing=True, working_folder=tmp_path, logging=False)
+    aci.variables = {"name": "test", "descr": "Test tenant"}
+    aci.template = (
+        "fvTenant:\n  - name: {{ name }}\n    descr: {{ descr }}\n",
+        "tenant.j2",
+    )
+    aci.deploy()
+
+    assert aci.results[0]["success"] is True
+    assert "test" in aci.config

{devaci-1.0.0 → devaci-1.0.1}/tests/test_jinja.py

@@ -6,23 +6,29 @@ from devaci.jinja import JinjaRenderer
 
 def test_render_mapping():
     renderer = JinjaRenderer()
-    out = renderer.render("fvTenant:\n  - name: acme\n", name="t.j2")
+    out = renderer.render("fvTenant:\n  - name: acme\n")
     assert out == {"fvTenant": [{"name": "acme"}]}
 
 
 def test_render_with_variables():
     renderer = JinjaRenderer()
-    out = renderer.render("fvTenant:\n  - name: {{ tenant }}\n", name="t.j2", tenant="acme")
+    out = renderer.render("fvTenant:\n  - name: {{ tenant }}\n", tenant="acme")
+    assert out == {"fvTenant": [{"name": "acme"}]}
+
+
+def test_render_variable_named_name():
+    renderer = JinjaRenderer()
+    out = renderer.render("fvTenant:\n  - name: {{ name }}\n", name="acme")
     assert out == {"fvTenant": [{"name": "acme"}]}
 
 
 def test_render_syntax_error():
     renderer = JinjaRenderer()
     with pytest.raises(JinjaError):
-        renderer.render("{% if %}", name="t.j2")
+        renderer.render("{% if %}")
 
 
 def test_render_non_mapping():
     renderer = JinjaRenderer()
     with pytest.raises(JinjaError):
-        renderer.render("- a\n- b\n", name="t.j2")
+        renderer.render("- a\n- b\n")