V1.0

app/forms.py

@@ -9,4 +9,9 @@ class LoginForm(FlaskForm):
 class NewPrefixForm(FlaskForm):
     subnet = StringField(validators=[DataRequired(),IPAddress(ipv4=True),Length(max=128)])
     prefix = IntegerField(validators=[DataRequired(),NumberRange(min=0,max=32)])
+    description = StringField(validators=[DataRequired(),Length(max=128)])
+    
+class NewAllocationForm(FlaskForm):
+    ipv4 = StringField(validators=[DataRequired(),IPAddress(ipv4=True),Length(max=128)])
+    hostname = StringField(validators=[DataRequired(),Length(max=128)])
     description = StringField(validators=[DataRequired(),Length(max=128)])

app/models.py

@@ -8,9 +8,16 @@ class User(UserMixin, db.Model):
     is_admin = db.Column(db.Boolean(),default=False)
     dat_last = db.Column(db.DateTime())
     
-class Prefix(db.Model):
+class Network(db.Model):
     id = db.Column(db.Integer(),primary_key=True,unique=True)
     prefix = db.Column(db.Integer())
     network_address = db.Column(db.String(16),unique=True)
     hosts = db.Column(db.Integer())
-    description = db.Column(db.String(32),unique=True)
+    description = db.Column(db.String(32),unique=True)
+    
+class Allocation(db.Model):
+    ipv4 = db.Column(db.String(16),primary_key=True,unique=True)
+    net_id = db.Column(db.Integer(),db.ForeignKey('network.id'))
+    hardware_id = db.Column(db.Integer())
+    hostname = db.Column(db.String(32),unique=True)
+    description = db.Column(db.String(64))

app/routes/r_base.py

@@ -1,13 +1,13 @@
 from datetime import datetime
 from flask import Blueprint, request, render_template, flash, redirect, url_for
 from flask_login import login_required, current_user
-from ipaddress import IPv4Network
+from ipaddress import IPv4Network, IPv4Address
 
 from app._config import app_version
 
 from app.extensions import *
 from app.models import *
-from app.forms import NewPrefixForm
+from app.forms import NewPrefixForm, NewAllocationForm
 
 base = Blueprint('base', __name__)
 
@@ -24,20 +24,20 @@ def dashboard():
     
     return render_template('panel/dashboard.html', title="Dashboard", is_dash=True, app_version=app_version)
 
-@base.route('/networks',methods=['GET','POST'])
+@base.route('/network',methods=['GET','POST'])
 @login_required
 def networks():
-    prefixes = Prefix.query.all()
+    networks = Network.query.all()
     form = NewPrefixForm()
     if request.method == 'POST' and form.validate_on_submit():
         try:
             network = IPv4Network(f"{str(form.subnet.data)}/{str(form.prefix.data)}")
             
-            add_prefix = Prefix(network_address=str(network.network_address),prefix=network.prefixlen,hosts=network.num_addresses,description=str(form.description.data))
+            add_net = Network(network_address=str(network.network_address),prefix=network.prefixlen,hosts=network.num_addresses,description=str(form.description.data))
-            db.session.add(add_prefix)
+            db.session.add(add_net)
             db.session.commit()
             
-            return f"done {network.num_addresses}"
+            return redirect(url_for('base.networks'))
             
         except:
             flash("Invalid Subnet or Prefix", 'danger')
@@ -45,9 +45,26 @@ def networks():
     elif form.errors:
         flash(form.errors, 'danger')
         
-    return render_template('panel/networks.html', title="Prefixes", is_networks=True, app_version=app_version, prefixes=prefixes, form=form)
+    return render_template('panel/networks.html', title="Prefixes", is_networks=True, app_version=app_version, prefixes=networks, form=form)
 
-@base.route('/networks/allocations/<string:network>',methods=['GET','POST'])
+@base.route('/network/allocations/<int:net_id>',methods=['GET','POST'])
 @login_required
-def allocations(network):
+def allocations(net_id):
-    return f"Allocations for {network}"
+    
+    db_allocations = Allocation.query.filter_by(net_id=net_id).all()
+    db_network = Network.query.filter_by(id=net_id).first()
+    
+    form = NewAllocationForm()
+    if request.method == 'POST' and form.validate_on_submit():
+        network = IPv4Network(f"{str(db_network.network_address)}/{str(db_network.prefix)}")
+        if IPv4Address(form.ipv4.data) in network.hosts():
+            add_alloc = Allocation(ipv4=str(form.ipv4.data),net_id=db_network.id,hostname=str(form.hostname.data),description=str(form.description.data))
+            db.session.add(add_alloc)
+            db.session.commit()
+            return redirect(url_for('base.allocations',net_id=net_id))
+        
+        return 'nok'
+    
+    
+    
+    return render_template('panel/allocations.html', title="Allocations", is_networks=True, app_version=app_version, form=form, allocations=db_allocations, network=db_network)

app/static/css/bootstrap.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../scss/mixins/_banner.scss","../../scss/_root.scss","dist/css/bootstrap.css","../../scss/vendor/_rfs.scss","../../scss/mixins/_color-mode.scss","../../scss/_reboot.scss","../../scss/mixins/_border-radius.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/_containers.scss","../../scss/mixins/_container.scss","../../scss/mixins/_breakpoints.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/_tables.scss","../../scss/mixins/_table-variants.scss","../../scss/forms/_labels.scss","../../scss/forms/_form-text.scss","../../scss/forms/_form-control.scss","../../scss/mixins/_transition.scss","../../scss/mixins/_gradients.scss","../../scss/forms/_form-select.scss","../../scss/forms/_form-check.scss","../../scss/forms/_form-range.scss","../../scss/forms/_floating-labels.scss","../../scss/forms/_input-group.scss","../../scss/mixins/_forms.scss","../../scss/_buttons.scss","../../scss/mixins/_buttons.scss","../../scss/_transitions.scss","../../scss/_dropdown.scss","../../scss/mixins/_caret.scss","../../scss/_button-group.scss","../../scss/_nav.scss","../../scss/_navbar.scss","../../scss/_card.scss","../../scss/_accordion.scss","../../scss/_breadcrumb.scss","../../scss/_pagination.scss","../../scss/mixins/_pagination.scss","../../scss/_badge.scss","../../scss/_alert.scss","../../scss/_progress.scss","../../scss/_list-group.scss","../../scss/_close.scss","../../scss/_toasts.scss","../../scss/_modal.scss","../../scss/mixins/_backdrop.scss","../../scss/_tooltip.scss","../../scss/mixins/_reset-text.scss","../../scss/_popover.scss","../../scss/_carousel.scss","../../scss/mixins/_clearfix.scss","../../scss/_spinners.scss","../../scss/_offcanvas.scss","../../scss/_placeholders.scss","../../scss/helpers/_color-bg.scss","../../scss/helpers/_colored-links.scss","../../scss/helpers/_focus-ring.scss","../../scss/helpers/_icon-link.scss","../../scss/helpers/_ratio.scss","../../scss/helpers/_position.scss","../../scss/helpers/_stacks.scss","../../scss/helpers/_visually-hidden.scss","../../scss/mixins/_visually-hidden.scss","../../scss/helpers/_stretched-link.scss","../../scss/helpers/_text-truncation.scss","../../scss/mixins/_text-truncate.scss","../../scss/helpers/_vr.scss","../../scss/mixins/_utilities.scss","../../scss/utilities/_api.scss"],"names":[],"mappings":"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 truncated

app/static/css/custom.css

@@ -1,4 +1,9 @@
-btn-exsm {
+.btn-exsm {
     padding-top: 1px;
     padding-bottom: 1px;
+}
+
+pre {
+    margin: 0;
+    padding: 0;
 }

app/templates/panel/allocations.html

@@ -0,0 +1,59 @@
+{% extends 'panel/_base.html' %}
+{% block content %}
+{% include 'panel/_nav.html' %}
+{% include 'panel/_flash.html' %}
+<div class="container" style="margin-top:5vh;">
+    <div class="row">
+        <!-- IPV4 TABLE -->
+        <div class="col-9">
+            <table class="table table-striped table-hover">
+                <thead>
+                    <tr>
+                    <th scope="col">Network</th>
+                    <th scope="col">IPv4</th>
+                    <th scope="col">Hostname</th>
+                    <th scope="col">Description</th>
+                    <th scope="col">Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for allocation in allocations %}
+                    <tr>
+                        <th scope="row">{{network.network_address}}</th>
+                        <td>{{allocation.ipv4}}</td>
+                        <td>{{allocation.hostname}}</td>
+                        <td><b>{{allocation.description}}</b></td>
+                        <td>
+                            <a href="" class="btn btn-sm btn-outline-info" style="padding-top:1px;padding-bottom:1px">edit</a>
+                            <button class="btn btn-sm btn-outline-danger"style="padding-top:1px;padding-bottom:1px">delete</button>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <!-- IPV4 FORM -->
+        <div class="col-3">
+            <div class="card p-4 shadow rounded-3">
+                <h2 class="text-center mb-4">Add IPv4</h2>
+                <form method="POST">
+                    {{ form.csrf_token }}
+                    <div class="mb-3">
+                        <label for="ipv4" class="form-label">IPv4</label>
+                        {{ form.ipv4(class="form-control", placeholder=network.network_address) }}
+                    </div>
+                    <div class="mb-3">
+                        <label for="prefix" class="form-label">Hostname</label>
+                        {{ form.hostname(class="form-control", placeholder="example") }}
+                    </div>
+                    <div class="mb-3">
+                        <label for="description" class="form-label">Description</label>
+                        {{ form.description(class="form-control", placeholder="webserver") }}
+                    </div>
+                    <button type="submit" class="btn btn-secondary w-100">Submit</button>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

app/templates/panel/networks.html

@@ -24,9 +24,9 @@
                         <td>{{network.network_address}}</td>
                         <td>{{network.prefix}}</td>
                         <td>X / {{network.hosts}} </td>
-                        <td>{{network.description}}</td>
+                        <td><b>{{network.description}}</b></td>
                         <td>
-                            <button class="btn btn-sm btn-outline-info" style="padding-top:1px;padding-bottom:1px">calculate</button>
+                            <a href="{{ url_for('base.allocations',net_id=network.id) }}" class="btn btn-sm btn-outline-info" style="padding-top:1px;padding-bottom:1px">Allocations</a>
                             <button class="btn btn-sm btn-outline-danger"style="padding-top:1px;padding-bottom:1px">delete</button>
                         </td>
                     </tr>