Reverse changes in iptables and quote comments

Author: brian-prometheus

capirca/lib/fortigate.py

@@ -676,7 +676,7 @@ def __str__(self):
     if self._term.owner:
       self._term.comment += [f"Owner: {self._term.owner}"]
     if self._term.comment and self._term.verbose:
-       lines += [f"{_SP * 2} set comments {self._obj_container.fix_comment_length((' ').join(self._term.comment))}"]
+       lines += [f'{_SP * 2} set comments "{self._obj_container.fix_comment_length((" ").join(self._term.comment))}"']
     lines += [f"{_SP * 2} set srcintf {self._term.source_interface or 'any'}"]
     lines += [f"{_SP * 2} set dstintf {self._term.destination_interface or 'any'}"]
     exist_src6 = False

capirca/lib/iptables.py

@@ -227,10 +227,6 @@ def __str__(self):
     if self.term.destination_interface:
       destination_interface = self.term.destination_interface
 
-    interface = ''
-    if self.term.interface:
-      interface = self.term.interface
-
     log_hits = False
     if self.term.logging:
       # Iptables sends logs to hosts configured syslog
@@ -308,7 +304,6 @@ def __str__(self):
                     tcp_matcher,
                     source_interface,
                     destination_interface,
-                    interface,
                     log_hits,
                     self._action_table.get(str(self.term.action[0]))
                     ))
@@ -661,7 +656,6 @@ def _BuildTokens(self):
                          'destination_prefix',
                          'fragment_offset',
                          'icmp_code',
-                         'interface',
                          'logging',
                          'log_limit',
                          'owner',