Skip to content

Issue 1 duplicate line #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
grelleum wants to merge 5 commits into from
Closed

Issue 1 duplicate line #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7028870
add dupline test, currently failing
itdependsnetworks May 8, 2021
5440e8b
Merge branch 'dupline' of github.com:networktocode/netutils into issu…
grelleum Sep 27, 2021
9d49f26
Updated to reflect expected output from compliance function.
grelleum Sep 27, 2021
95d4723
Check duplicate line for indentation before assigning parent.
grelleum Sep 27, 2021
61a0da2
Bumped version number to '0.2.3'
grelleum Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netutils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Initialization file for library."""

__version__ = "0.2.2"
__version__ = "0.2.3"
Copy link
Contributor

@itdependsnetworks itdependsnetworks Sep 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out, this actually has to be fixed in a few places. You can remove this and squash, i'll update in another PR

2 changes: 1 addition & 1 deletion netutils/config/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ def _update_same_line_children_configs(self):
"""Update parents in ``self.config_lines`` per ``self.same_line_children``."""
new_config_lines = []
for line in self.config_lines:
if line in self.same_line_children:
if line in self.same_line_children and line.config_line[0].isspace():
previous_line = new_config_lines[-1]
previous_config_line = previous_line.config_line
current_parents = previous_line.parents + (previous_config_line,)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "netutils"
version = "0.2.2"
version = "0.2.3"
description = "Common helper functions useful in network automation."
authors = ["Network to Code, LLC <opensource@networktocode.com>"]
license = "Apache-2.0"
Expand Down
9 changes: 9 additions & 0 deletions tests/unit/mock/config/compliance/compliance/cisco_ios/ios_logging_backup.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
!
logging history size 500
logging origin-id hostname
logging source-interface Loopback0
logging host 10.5.84.24
!
logging trap informational
!
!
3 changes: 3 additions & 0 deletions tests/unit/mock/config/compliance/compliance/cisco_ios/ios_logging_feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
features = [
{"name": "log", "ordered": True, "section": ["logging ", "no logging "]},
Copy link
Contributor

@itdependsnetworks itdependsnetworks Sep 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grelleum , sorry, I realize that I did this, but can you add a feature for snmp as well? I think it was failing before with a stracktrace, and hence this test, but I think that we should now be clear about the expectation of a duplicate line.

e.g. add,
{"name": "snmp", "ordered": False, "section": ["snmp-server "]},

]
9 changes: 9 additions & 0 deletions tests/unit/mock/config/compliance/compliance/cisco_ios/ios_logging_intended.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
logging source-interface Loopback0
logging host 10.1.1.1
!
logging trap informational
!
snmp-server community <<REPLACED>> RO SNMP_ACL_RO
snmp-server community <<REPLACED>> RW SNMP_ACL_RW
snmp-server community <<REPLACED>> RO SNMP_ACL_RO
!
12 changes: 12 additions & 0 deletions tests/unit/mock/config/compliance/compliance/cisco_ios/ios_logging_received.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"log": {
"compliant": false,
"missing": "logging host 10.1.1.1",
"extra": "logging history size 500\nlogging origin-id hostname\nlogging host 10.5.84.24",
"cannot_parse": true,
"unordered_compliant": false,
"ordered_compliant": false,
"actual": "logging history size 500\nlogging origin-id hostname\nlogging source-interface Loopback0\nlogging host 10.5.84.24\nlogging trap informational",
"intended": "logging source-interface Loopback0\nlogging host 10.1.1.1\nlogging trap informational"
}
}