From 8af1b59af442ed8f8d25a8367bd9e0be68991661 Mon Sep 17 00:00:00 2001 From: RouteNotTaken Date: Thu, 28 Apr 2022 11:28:01 -0700 Subject: [PATCH 1/2] Move return outside of for loop --- capirca/lib/ciscoasa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capirca/lib/ciscoasa.py b/capirca/lib/ciscoasa.py index 6bd14e0c..6e394c1b 100644 --- a/capirca/lib/ciscoasa.py +++ b/capirca/lib/ciscoasa.py @@ -100,7 +100,7 @@ def __str__(self): for line in self.term.verbatim: if line[0] == 'ciscoasa': ret_str.append(str(line[1])) - return '\n'.join(ret_str) + return '\n'.join(ret_str) # protocol if not self.term.protocol: From e3a3a16146dcd0cd0d7a191ce3e30b1b643abac8 Mon Sep 17 00:00:00 2001 From: RouteNotTaken Date: Fri, 29 Apr 2022 08:46:07 -0700 Subject: [PATCH 2/2] Add ciscoASA test for multiple verbatim lines --- tests/lib/ciscoasa_test.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/lib/ciscoasa_test.py b/tests/lib/ciscoasa_test.py index fb9b4852..c1b16479 100644 --- a/tests/lib/ciscoasa_test.py +++ b/tests/lib/ciscoasa_test.py @@ -43,6 +43,13 @@ policer:: batman } """ +GOOD_TERM_3 = """ +term good-term-3 { + verbatim:: ciscoasa "asa had a little lamb" + verbatim:: ciscoasa "asa had a second lamb" + verbatim:: ciscoasa "asa had a third lamb" +} +""" SUPPORTED_TOKENS = { 'action', @@ -139,6 +146,12 @@ def testBuildWarningTokens(self): self.assertEqual(st, SUPPORTED_TOKENS) self.assertEqual(sst, SUPPORTED_SUB_TOKENS) + def testVerbatimTerm(self): + pol1 = ciscoasa.CiscoASA(policy.ParsePolicy(GOOD_HEADER + GOOD_TERM_3, + self.naming), EXP_INFO) + self.assertIn("asa had a little lamb", str(pol1), str(pol1)) + self.assertIn("asa had a second lamb", str(pol1), str(pol1)) + self.assertIn("asa had a third lamb", str(pol1), str(pol1)) if __name__ == '__main__': absltest.main()