diff --git a/cisco/asa/asa.object_group.sublime-completions b/cisco/asa/asa.object_group.sublime-completions index 7e6fe4d..00dc484 100644 --- a/cisco/asa/asa.object_group.sublime-completions +++ b/cisco/asa/asa.object_group.sublime-completions @@ -1,3 +1,4 @@ + { "scope": "text.network.cisco.asa.object_group", "completions": [ diff --git a/messages.json b/messages.json index 59cf023..903c7f0 100644 --- a/messages.json +++ b/messages.json @@ -53,5 +53,6 @@ "2.46.0": "messages/2.46.0.md", "2.47.0": "messages/2.47.0.md", "2.48.0": "messages/2.48.0.md", - "2.50.0": "messages/2.50.0.md" -} + "2.50.0": "messages/2.50.0.md", + "2.51.0": "messages/2.51.0.md" +} \ No newline at end of file diff --git a/messages/2.51.0.md b/messages/2.51.0.md new file mode 100644 index 0000000..2b566a1 --- /dev/null +++ b/messages/2.51.0.md @@ -0,0 +1,31 @@ +# [2.51.0] - 2021.05.06 + +* Cisco ASA + + * Missing port names + + * tacacs + + * netbios-dgm + + * bootps + + * bootpc + + * citrix-ica + + * citrix-netbios-ns + + * tftp + +* Cisco IOS + + * aaa authorization [#19](https://github.com/heyglen/network_tech/issues/19) + + * aaa accounting [#19](https://github.com/heyglen/network_tech/issues/19) + + * HundredGigE interface name [#38](https://github.com/heyglen/network_tech/issues/38) + + * FourtyGigE interface name [#38](https://github.com/heyglen/network_tech/issues/38) + + * Autocomplete interface Gig & TenGig improvements diff --git a/messages/head.md b/messages/head.md index 483df2f..17c99ea 100644 --- a/messages/head.md +++ b/messages/head.md @@ -1,31 +1,2 @@ # [{{version}}] - {{date}} -* Cisco ASA - - * Missing port names - - * tacacs - - * netbios-dgm - - * bootps - - * bootpc - - * citrix-ica - - * citrix-netbios-ns - - * tftp - -* Cisco IOS - - * aaa authorization [#19](https://github.com/heyglen/network_tech/issues/19) - - * aaa accounting [#19](https://github.com/heyglen/network_tech/issues/19) - - * HundredGigE interface name [#38](https://github.com/heyglen/network_tech/issues/38) - - * FourtyGigE interface name [#38](https://github.com/heyglen/network_tech/issues/38) - - * Autocomplete interface Gig & TenGig improvements diff --git a/tests/syntax_test_cisco_asa.cisco-asa b/tests/syntax_test_cisco_asa.cisco-asa index 57098ec..e8c4669 100644 --- a/tests/syntax_test_cisco_asa.cisco-asa +++ b/tests/syntax_test_cisco_asa.cisco-asa @@ -166,51 +166,52 @@ object service tcp_1234 service tcp destination range 1 2 service tcp destination eq 1234 service udp source eq 1234 - exit + +write access-list cached ACL log flows: total 6443, denied 0 (deny-flow-max 4096) alert-interval 300 - access-list acl-name remark this is a remark - access-list acl-name line 0 remark this is a remark - access-list acl-name; 42 elements; name hash: 0xbe299002 - access-list acl-name extended permit icmp any4 any4 object-group icmp_group - access-list acl-name line 42 extended permit icmp any4 any4 object-group icmp_group - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 neq www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 ge www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 gt www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 le www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 lt www - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq https - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq sunrpc - access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 object dst_ports - access-list acl-name line 42 extended permit tcp host 2.2.2.2 object src_ports host 3.3.3.3 - access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group src_ports host 3.3.3.3 object-group dst_ports - access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group network-dst eq 2059 inactive (inactive) - access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group network-dst eq 2059 inactive (inactive) - access-list acl-name line 42 extended permit tcp 2.2.2.2 255.255.255.0 object-group network-dst eq 2059 inactive (inactive) - access-list acl-name line 42 extended permit tcp object-group group1 host 1.1.1.1 eq sqlnet 0x2e7027d7 - access-list acl-name extended permit tcp object-group group1 host 1.1.1.1 eq sqlnet 0x2e7027d7 - access-list acl-name line 42 extended deny icmp any host 1.1.1.1 log - access-list acl-name line 42 extended deny icmp any host 1.1.1.1 log 1 - access-list acl-name line 42 extended deny tcp any host 1.1.1.1 log - access-list acl-name line 42 extended deny tcp any host 1.1.1.1 log 1 - access-list acl-name line 42 extended deny icmp any host 1.1.1.1 timestamp-request - access-list acl-name line 42 extended deny icmp any host 1.1.1.1 traceroute - access-list acl-name line 42 extended permit object services object-group network-src object-group network-dst - access-list acl-name line 42 extended permit object services object network-src object network-dst - access-list acl-name line 42 extended permit object-group services object-group network-src object-group network-dst - access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 disable 0x2e7027d7 - access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 disable default 0x2e7027d7 - access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 default 0x2e7027d7 - access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log debugging interval 300 0x2e7027d7 - access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log notifications interval 300 0x2e7027d7 - access-list acl-name line 42 extended permit icmp host 2.2.2.2 host 1.1.1.1 echo log informational interval 300 - access-list acl-name line 42 extended permit tcp host 1.1.1.1 object-group group-3 eq 2059 inactive (hitcnt=0) - access-list acl-name line 42 extended permit 41 host 1.1.1.1 host 2.2.2.2 - access-list acl-name line 42 extended permit 41 host 1.1.1.1 host 2.2.2.2 eq tacacs - access-list acl-name extended deny ip any4 any4 - access-list acl-name extended deny ip any6 any6 +access-list acl-name remark this is a remark +access-list acl-name line 0 remark this is a remark +access-list acl-name; 42 elements; name hash: 0xbe299002 +access-list acl-name extended permit icmp any4 any4 object-group icmp_group +access-list acl-name line 42 extended permit icmp any4 any4 object-group icmp_group +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 neq www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 ge www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 gt www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 le www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 lt www +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq https +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 eq sunrpc +access-list acl-name line 42 extended permit tcp host 2.2.2.2 host 3.3.3.3 object dst_ports +access-list acl-name line 42 extended permit tcp host 2.2.2.2 object src_ports host 3.3.3.3 +access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group src_ports host 3.3.3.3 object-group dst_ports +access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group network-dst eq 2059 inactive (inactive) +access-list acl-name line 42 extended permit tcp host 2.2.2.2 object-group network-dst eq 2059 inactive (inactive) +access-list acl-name line 42 extended permit tcp 2.2.2.2 255.255.255.0 object-group network-dst eq 2059 inactive (inactive) +access-list acl-name line 42 extended permit tcp object-group group1 host 1.1.1.1 eq sqlnet 0x2e7027d7 +access-list acl-name extended permit tcp object-group group1 host 1.1.1.1 eq sqlnet 0x2e7027d7 +access-list acl-name line 42 extended deny icmp any host 1.1.1.1 log +access-list acl-name line 42 extended deny icmp any host 1.1.1.1 log 1 +access-list acl-name line 42 extended deny tcp any host 1.1.1.1 log +access-list acl-name line 42 extended deny tcp any host 1.1.1.1 log 1 +access-list acl-name line 42 extended deny icmp any host 1.1.1.1 timestamp-request +access-list acl-name line 42 extended deny icmp any host 1.1.1.1 traceroute +access-list acl-name line 42 extended permit object services object-group network-src object-group network-dst +access-list acl-name line 42 extended permit object services object network-src object network-dst +access-list acl-name line 42 extended permit object-group services object-group network-src object-group network-dst +access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 disable 0x2e7027d7 +access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 disable default 0x2e7027d7 +access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log informational interval 300 default 0x2e7027d7 +access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log debugging interval 300 0x2e7027d7 +access-list acl-name line 42 extended permit tcp any host 2.2.2.2 eq domain log notifications interval 300 0x2e7027d7 +access-list acl-name line 42 extended permit icmp host 2.2.2.2 host 1.1.1.1 echo log informational interval 300 +access-list acl-name line 42 extended permit tcp host 1.1.1.1 object-group group-3 eq 2059 inactive (hitcnt=0) +access-list acl-name line 42 extended permit 41 host 1.1.1.1 host 2.2.2.2 +access-list acl-name line 42 extended permit 41 host 1.1.1.1 host 2.2.2.2 eq tacacs +access-list acl-name extended deny ip any4 any4 +access-list acl-name extended deny ip any6 any6 access-group acl-name in interface outside diff --git a/tests/syntax_test_cisco_ios.cisco-ios b/tests/syntax_test_cisco_ios.cisco-ios index 590da7b..1e05596 100644 --- a/tests/syntax_test_cisco_ios.cisco-ios +++ b/tests/syntax_test_cisco_ios.cisco-ios @@ -425,6 +425,10 @@ router bgp 12 ip route 1.2.4.0 255.255.255.0 1.2.3.4 +interface FourtyGigE0/1 + + exit + interface HundredGigE1/2/3 exit diff --git a/tools/release.py b/tools/release.py index 0ce8a8d..d54c580 100644 --- a/tools/release.py +++ b/tools/release.py @@ -8,21 +8,12 @@ import click import git -import semver from github import Github REPO_NAME = "network_tech" class Version: - _setup_file_path = standard.configuration_path - - @classmethod - def _get_config(cls): - config = configparser.ConfigParser() - config.read(cls._setup_file_path) - return config - @classmethod def current(cls): file = str(pathlib.Path() / "messages.json") @@ -34,20 +25,22 @@ def current(cls): for version in messages_index: if version == "install": continue + major, minor, patch = [int(v) for v in version.split(".")] + c_major, c_minor, c_patch = current_version - if major < current_version[0]: + if major < c_major: continue - if minor < current_version[1]: + if major == c_major and minor < c_minor: continue - if patch < current_version[2]: + if major == c_major and minor == c_minor and patch < c_patch: continue current_version = (major, minor, patch) - return ".".join(current_version) + return ".".join([str(v) for v in current_version]) @classmethod def major(cls): @@ -74,18 +67,15 @@ def bump(cls, part): minor += 1 elif part == "patch": patch += 1 - return ".".join([major, minor, patch]) + return f"{major}.{minor}.{patch}" def perform_release(release_type): current_version = Version.current() - new_version = getattr(Version, release_type)() - print(current_version) - print(new_version) - return message = create_message(new_version) - version_control(version, new_version) + + version_control(current_version, new_version) github_release(REPO_NAME, new_version, message)