serialization fixes

amyasnikov · Feb 18, 2024 · 425b7bd · 425b7bd
1 parent 5286168
commit 425b7bd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/validity/compliance/serialization/textfsm.py b/validity/compliance/serialization/textfsm.py
@@ -3,7 +3,7 @@
 import textfsm
 
 
-def serialize_textfsm(plain_data: str, template: str):
+def serialize_textfsm(plain_data: str, template: str) -> list[dict]:
     dict_results = []
     template_file = io.StringIO(template)
     fsm = textfsm.TextFSM(template_file)

diff --git a/validity/pollers/netconf.py b/validity/pollers/netconf.py
@@ -14,5 +14,6 @@ class ScrapliNetconfPoller(ConsecutivePoller):
     host_param_name = "host"
 
     def poll_one_command(self, driver: NetconfDriver, command: "Command") -> str:
-        response = driver.rpc(command.parameters["rpc"])
-        return response.result
+        with driver:
+            response = driver.rpc(command.parameters["rpc"])
+            return response.result
diff --git a/validity/subforms.py b/validity/subforms.py
@@ -3,6 +3,7 @@
     1. Render part of the main form for JSON Field
     2. Validate JSON Field
 """
+import textwrap
 import xml.etree.ElementTree as ET
 
 from django import forms
@@ -31,7 +32,16 @@ class JSONAPICommandForm(BootstrapMixin, forms.Form):
 
 
 class NetconfCommandForm(BootstrapMixin, forms.Form):
-    rpc = forms.CharField(label=_("RPC"), widget=forms.Textarea(attrs={"placeholder": "<get-config/>"}))
+    get_config = textwrap.dedent(
+        """
+        <get-config>
+          <source>
+            <running/>
+          </source>
+        </get-config>
+        """
+    ).lstrip("\n")
+    rpc = forms.CharField(label=_("RPC"), widget=forms.Textarea(attrs={"placeholder": get_config}))
 
     def clean_rpc(self):
         rpc = self.cleaned_data["rpc"]