5 Commits 7521bbc5ec ... 2f7fd5786a

Author SHA1 Message Date
  Joe Clarke 2f7fd5786a Fix some issues and add copyright. 7 months ago
  Joe Clarke a44b96f947 Ignore line too long and increase complexity. 7 months ago
  Joe Clarke 965058c8e3 Fix flake issues. 7 months ago
  Joe Clarke 5d8b02125e Ignore where operators go. 7 months ago
  Joe Clarke 267baaa8ef Update copyright date. 7 months ago

+ 2 - 2
.flake8

@@ -1,5 +1,5 @@
 [flake8]
 exclude = cmlutils,*venv*,.git,.eggs,__pycache__,docs/source/conf.py,old,build,dist
-ignore = E731, E402
-max-complexity = 20
+ignore = E731, E402, W503, E501
+max-complexity = 30
 max-line-length = 140

+ 25 - 1
automation/services/notify_dc_users.py

@@ -1,4 +1,28 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2017-2024  Joe Clarke <jclarke@cisco.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
 
 from __future__ import print_function
 import pickle
@@ -213,7 +237,7 @@ def main():
                 break
 
         if not ova_bool and ostype is None:
-            print(f"WARNING: Did not find OS type for {vm['os']} on row {i}")
+            print(f"WARNING: Did not find OS type for {opsys} on row {i}")
             continue
 
         vm = {

+ 3 - 7
automation/services/tool-to-librenms.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2017-2023  Joe Clarke <jclarke@cisco.com>
+# Copyright (c) 2017-2024  Joe Clarke <jclarke@cisco.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,8 @@ requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 import json
 import sys
 import time
-import os
-from subprocess import PIPE, run
+from subprocess import run
 import shlex
-from sparker import Sparker  # type: ignore
 import re
 import CLEUCreds  # type: ignore
 from cleu.config import Config as C  # type: ignore
@@ -44,7 +42,6 @@ CACHE_FILE = "/home/jclarke/monitored_devs.json"
 
 
 def get_devs():
-
     url = "http://{}/get/switches/json".format(C.TOOL)
 
     devs = []
@@ -72,7 +69,6 @@ def get_devs():
 
 
 def delete_device(dev):
-
     res = run(shlex.split("ssh -2 {} /usr/local/www/librenms/delhost.php {}".format(C.MONITORING, dev)), capture_output=True)
 
     return res
@@ -131,7 +127,7 @@ if __name__ == "__main__":
                 devs[tdev["AssetTag"]] = tdev["Hostname"]
                 changed_devs = True
                 continue
-            except Exception as e:
+            except Exception:
                 if not response or response.status_code != 400:
                     text = ""
                     if response:

+ 1 - 1
automation/services/update-netbox-tool.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2017-2023  Joe Clarke <jclarke@cisco.com>
+# Copyright (c) 2017-2024  Joe Clarke <jclarke@cisco.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without