Clenaup of python middleware

middleware/net_suite/__init__.py

 from json import JSONEncoder
 
-from flask import Flask, url_for, jsonify
+from flask import Flask
 from beaker.middleware import SessionMiddleware
 from kitnet.lib.netdb import PostgreSQL
-import sys
 import os
-import inspect
 import subprocess
 from .model import DBObject, MetaDBObject, SimpleKITUser
 import importlib
@@ -26,7 +24,7 @@ session_opts = {
 
 class ModMetaData(object):
     def __init__(self, name, version, contact_email, printable_name, mod_path, gitlab_url=None, search_func=None,
-                 search_opts_func=None, is_tool=False):
+                 search_opts_func=None):
         self.version = version
         self.contact_mail = contact_email
         self.gitlab_url = gitlab_url
@@ -35,7 +33,6 @@ class ModMetaData(object):
         self.name = name
         self.search_func = search_func
         self.search_opts_func = search_opts_func if search_func is not None else None
-        self.is_tool = is_tool
 
 
 class CustomJSONEncoder(JSONEncoder):
@@ -62,6 +59,7 @@ class CustomJSONEncoder(JSONEncoder):
 class MyApp(Flask):
     pass
 
+
 # Define the WSGI application object
 app = MyApp(__name__)
 app.json_encoder = CustomJSONEncoder
@@ -95,10 +93,11 @@ def load_mods():
         mod = importlib.import_module(m['mod'])
         MODS.append(mod.METADATA)
         app.register_blueprint(blueprint=getattr(mod, m['mod'].split('.')[-1]),
-                               url_prefix='{prefix}{url}'.format(prefix='/tools' if mod.METADATA.is_tool else '',
-                                                                 url=m['url']))
+                               url_prefix='{prefix}{url}'.format(prefix='', url=m['url']))
+
 
 def finalize_init():
     db_conn.close()
 
+
 from . import views

middleware/net_suite/modules/dhcp_leases/__init__.py

@@ -2,7 +2,6 @@ from flask import Blueprint
 from . import dhcp_leases_model
 from net_suite import app, get_git_version, ModMetaData
 
-# we are assuming, that at the time of loading the app is initializes and the config is loaded
 bb_name = 'dhcp_leases'
 dhcp_leases = Blueprint(bb_name, __name__, template_folder='templates')
 

middleware/net_suite/modules/dhcp_leases/views.py

@@ -5,13 +5,14 @@ from . import dhcp_leases_model
 from net_suite import db
 from net_suite.model import BCD
 
+
 def get_dhcpleaseDB():
     if not hasattr(g, 'dhcpleaseDB'):
         g.dhcpleaseDB = dhcp_leases_model.DhcpLeaseDB(database=current_app.config['MINIDHCPVS_DB'],
-                                                     user=current_app.config['MINIDHCPVS_USER'],
-                                                     host=current_app.config['MINIDHCPVS_HOST'],
-                                                     port=current_app.config['MINIDHCPVS_PORT'],
-                                                     password=current_app.config['MINIDHCPVS_PW'])
+                                                      user=current_app.config['MINIDHCPVS_USER'],
+                                                      host=current_app.config['MINIDHCPVS_HOST'],
+                                                      port=current_app.config['MINIDHCPVS_PORT'],
+                                                      password=current_app.config['MINIDHCPVS_PW'])
     return g.dhcpleaseDB
 
 
@@ -28,7 +29,7 @@ def usr_bcds():
     user = request.environ['beaker.session']['login']
     user_bcds = user.get_bcds(db, get_db_conn())
     bcd_counts = dhcpDB.get_active_mac_counts([b.name for b in user_bcds])
-    return jsonify(bcd_counts) 
+    return jsonify(bcd_counts)
 
 
 @dhcp_leases.route("/bcds/<bcd_name>/active")
@@ -43,4 +44,4 @@ def active_leases(bcd_name):
     if bcd is None:
         return abort(404)
     leases = dhcpDB.get_active_macs(bcd_name)
-    return jsonify(leases) 
+    return jsonify(leases)

middleware/net_suite/modules/ip_contact/__init__.py

@@ -8,6 +8,6 @@ ip_contact = Blueprint(bb_name, __name__, template_folder='templates')
 
 METADATA = ModMetaData(name=bb_name, mod_path=__name__, gitlab_url='https://git.scc.kit.edu/scc-net/net-suite/net-suite-ip_contact',
                        printable_name='Adressbetreuer kontaktieren', version=get_git_version(__file__),
-                       contact_email='dns-betrieb@scc.kit.edu', is_tool=True)
+                       contact_email='dns-betrieb@scc.kit.edu')
 MENU = {METADATA.printable_name: 'ip_contact.main'}
 from . import views

middleware/net_suite/modules/macfinder/__init__.py

@@ -10,12 +10,12 @@ app.logger.info('Loading OUI databse...')
 ouis = requests.get('http://standards-oui.ieee.org/oui.txt').text.split('\n')
 OUI_DB = dict()
 for line in ouis:
-    if not '(hex)' in line:
+    if '(hex)' not in line:
         continue
     parts = line.split('(hex)')
     OUI_DB[parts[0].strip().lower().replace('-', ':')] = parts[1].strip()
 
 METADATA = ModMetaData(name=bb_name, mod_path=__name__, gitlab_url='https://git.scc.kit.edu/scc-net/net-suite/net-suite-macfinder',
                        printable_name='MACFinder', version=get_git_version(__file__),
-                       contact_email='dns-betrieb@scc.kit.edu', is_tool=False)
+                       contact_email='dns-betrieb@scc.kit.edu')
 from . import views

middleware/net_suite/templates/debug_forward.html

+<html>
+<body>
+<h1>DEBUG: Forward user-data to {{new_target}}?</h1>
+<form method="post" action="{{new_target}}">
+    <input type="hidden" name="redir" value="{{redir}}">
+<ul>
+  {% for key, value in userinfo.items() %}
+
+    <dt>{{ key }}</dt>
+
+    <dd>{{ value }}</dd>
+    <input type="hidden" name="{{key}}" value="{{value}}">
+
+  {% endfor %}
+</ul>
+<button type="submit">OK</button>
+</form>
+</body>
+</html>