IP space visualization module by rasovica · Pull Request #59 · wlanslovenija/nodewatcher

rasovica · 2017-06-25T19:39:58Z

This module will add IP space map to nodewatcher, which will visualize and report statistics about network IP space usage.

…b.com/jaz303) and a few extra classes that make graph non selecteble.

…atcher into feature/cidr

mitar · 2017-06-25T19:43:10Z

In which way is this different from #58?

…static folder, Mike Bostock is author of d3.v4, hilbert2d.js and point.js are refractored from node.js version to browser version by me, original author(https://github.com/ryan-williams), jquery.tips.js is made by https://github.com/jaz303 this modules provide all i need to draw svg maps with tooltips using hilbert fractals.

kostko · 2017-06-27T07:36:34Z

            'visible': True,
        },
+        {
+            'name': 'Ip space',


Rename to "IP space".

kostko · 2017-06-27T07:37:25Z

                family='ipv4',
                network=pool['network'],
-                prefix_length=pool['cidr'],
+                prefix_length=pool['ip_space'],


These changes in import_nw2.py seem incorrect - was this a too broad search and replace?

That should not be touched from what I understand.
That is only used to import old Nodewatcher 2 JSON dump for migration

It doesn't look fixed, there are still some incorrect ip_space references in import_nw2.py? See diff.

robimarko · 2017-06-27T07:42:54Z

Please add some description so most people can at least get a sense of what you are doing here

mitar · 2017-06-27T08:30:29Z

Please put code attribution into code comments, not commit messages.

mitar · 2017-06-27T08:31:21Z

Don't use minimized JavaScript files. If we need those, we will just have minimization post-processing step for all files.

…rt error.

…des to svg, loading nodes asyncronusly and drawaing them to svg.

kostko · 2017-06-29T10:28:48Z

+
+components.partials.get_partial('ip_space_partial').add(components.PartialEntry(
+    name='general',
+    template='ip_space.html',


Is this ok that the template is at the top level? I think it should be better to move it under network/ip_space/ip_space.html or similar.

I also don't see where these partials are currently used? Are they needed at all? If not, they should be removed.

@rasovica where are you using these partials?

kostko · 2017-06-29T10:32:04Z

BTW, please fix your GitHub or the commits' e-mail address as they don't seem to correspond (unknown author).

…e positioning bug.

kostko · 2017-07-11T14:15:16Z

        },
+        {
+            'name': 'IP space',
+            'weight': 70,


Should this be placed before the API entry instead?

I would put it before Map entry so it's next to network toplogoy

mitar · 2017-09-05T00:51:14Z

+                self.loadedPrefixes++;
+                if(self.data[i] == undefined){
+                    self.data[i] = data.results;
+                }else{


Into new line.

mitar · 2017-09-05T00:51:36Z

+                    jQuery('rect').tipsy({
+                        gravity: 'w',
+                        html: true,
+                        title: function() {


For anonymous function, use function () { style.

mitar · 2017-09-05T00:53:24Z

+
+    load() {
+        for (var i = 0; i < 33; i++) {
+            this.loadPrefix(i, 'api/v2/pool/ip/?format=json&prefix_length=' + i);


Get URL API from server-side and render-it into a template. See examples elsewhere how to do that.

You do not have to add format=json because getJSON adds needed headers already.

mitar · 2017-09-05T00:54:29Z

+       range[0] = (this.ip2num(cidr[0])) & ((-1 << (32 - cidr_1)));
+       var start = this.ip2num(range[0])
+       range[1] = range[0] + Math.pow(2, (32 - cidr_1)) - 1;
+       return [range[0]-this.offset, range[1]-this.offset];


Space around operators.

mitar · 2017-09-05T00:54:46Z

+        while( Math.pow(2, mask) < ips_needed){
+            mask++;
+        }
+        mask = 32-mask;


Space around operators.

…ulated.

mitar · 2017-09-06T05:44:46Z

+        this.svg = svg;
+        this.loadedPrefixes = 0;
+
+        this.n_ips = Math.pow(2, 32 - parseInt(subnet.split("/")[1]));


' instead ". Please when I make a comment, make sure yourself to check everywhere else for the same issue.

mitar · 2017-09-06T05:45:27Z

+        this.ips_side = Math.sqrt(this.n_ips);
+        this.ips_pixel = this.ips_side / (this.size * 1.0);
+        this.offset = 0;
+        this.draw(subnet, "Smallest possible network to fit all the ip pools");


ip -> IP

mitar · 2017-09-06T05:46:04Z

+        this.data = new Array(33);
+        this.base_url = url;
+        self = this;
+        $('#topnodes').on('click', '#cidr', function(event) {


You are already using class, so you can then also use (event) => { ... } which will bind this automatically so you do not have to use self.

BTW, style for anonymous functions is function (event) {.

mitar · 2017-09-06T05:46:50Z

+        return false;
+    }
+
+    UpdateQueryString(key, value, url) {


Camel case. Start with lower case.

mitar · 2017-09-06T05:47:10Z

+
+    subnetSize(subnet) {
+        var subnet_str = String(subnet);
+        var times = 32 - parseInt(subnet_str.split("/")[1]);


mitar · 2017-09-06T05:47:27Z

+    HSVtoRGB(h, s, v) {
+        var r, g, b, i, f, p, q, t;
+        if (arguments.length === 1) {
+            s = h.s, v = h.v, h = h.h;


Split this into multiple lines. No ,.

mitar · 2017-09-06T05:47:34Z

+        t = v * (1 - (1 - f) * s);
+        switch (i % 6) {
+            case 0:
+                r = v, g = t, b = p;


mitar · 2017-09-06T05:47:58Z

+        return '#' + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b);
+    }
+
+    get_url_param(sParam) {


Use camelCase not under_scores.

mitar · 2017-09-06T05:48:15Z

+
+    get_url_param(sParam) {
+        var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+            sURLVariables = sPageURL.split('&'),


No ,. Simply define one var per line.

mitar · 2017-09-06T05:48:35Z

+    }
+
+    UpdateQueryString(key, value, url) {
+        if (!url){


Space after ).

mitar · 2017-09-06T05:48:59Z

+            else {
+                hash = url.split('#');
+                url = hash[0].replace(re, '$1$3').replace(/(&|\?)$/, '');
+                if (typeof hash[1] !== 'undefined' && hash[1] !== null)


No if without {...}.

mitar · 2017-09-06T05:49:07Z

+                hash = url.split('#');
+                url = hash[0] + separator + key + '=' + value;
+                if (typeof hash[1] !== 'undefined' && hash[1] !== null)
+                    url += '#' + hash[1];


mitar · 2017-09-06T05:49:16Z

+                    url += '#' + hash[1];
+                return url;
+            }
+            else


mitar · 2017-09-06T05:49:48Z

+
+    loadPrefix(i, url) {
+        var self = this;
+        $.getJSON(url, function(data) {


You can use (data) => {...}.

mitar · 2017-09-06T05:50:41Z

+        $.getJSON(url, function(data) {
+            if(data.next != null){
+                self.loadPrefix(i, data.next);
+                if (self.data[i] == undefined) {


Always use ===.

mitar · 2017-09-06T05:51:23Z

+    loadPrefix(i, url) {
+        var self = this;
+        $.getJSON(url, function(data) {
+            if(data.next != null){


Spaces. Always use !==.

… from Support module.

…h pool, removed git modules that we don't need.

rasovica added 8 commits June 25, 2017 18:26

Added cidr map tab to menu, added cidr module.

2984d0d

Added cidr module to settings.py.

e818a1c

Set the menu entry weight.

7714d84

Added needed css file which has css for tooltips(author https://githu…

463cf53

…b.com/jaz303) and a few extra classes that make graph non selecteble.

Fixed mixed indentation.

b7c51cc

Fixed mixed indentation.

991313b

Merge branch 'feature/cidr' of https://github.com/wlanslovenija/nodew…

7d6ec13

…atcher into feature/cidr

Fixed another hidden tab.

ff88844

kostko changed the title ~~WiP: Cidr module added~~ WIP: CIDR module added Jun 25, 2017

rasovica added 4 commits June 27, 2017 06:12

Refractor cidr module to ip_space for better understanding.

71a0b71

Fixed settings.py to match new module name.

f60fad6

Moved javascript and css to local static folder.

41ba6d9

kostko requested changes Jun 27, 2017

View reviewed changes

mitar changed the title ~~WIP: CIDR module added~~ WIP: IP space module added Jun 27, 2017

rasovica added 5 commits June 27, 2017 11:10

Renamed to IP space, removed unused html files, fixed javascript expo…

fa02ee6

…rt error.

Replaced minified d3.v4 with source, changed the file in template.

692b82f

Fixed accidental serach and replace mistake.

7d65f42

Added authors of files into comments.

176ec80

Added topnode calculation, zooming to topnodes, drawing actual api no…

ed578df

…des to svg, loading nodes asyncronusly and drawaing them to svg.

kostko reviewed Jun 29, 2017

View reviewed changes

rasovica added 3 commits July 4, 2017 02:40

Rounding down map size to closes power of two in an attempt to fix th…

07616d5

…e positioning bug.

Adding zoom and pan to ip space overview.

152d9f1

Fixing the miss-alignment of networks.

fc237b6

kostko reviewed Jul 11, 2017

View reviewed changes

mitar reviewed Sep 5, 2017

View reviewed changes

rasovica added 4 commits September 5, 2017 06:09

Fixing a lot of stuff, from formatting to how minimal network is calc…

9def3b0

…ulated.

Removing console.

8476528

Adding urltemplate support.

a691e75

Fixing blank lines.

3d4ed2d

mitar reviewed Sep 6, 2017

View reviewed changes

Removing last console.log.

fda3e68

mitar reviewed Sep 6, 2017

View reviewed changes

rasovica added 4 commits September 12, 2017 17:57

Fixing pep8 and removing some unused functions.

893f90f

Adding Support module. Adding comments, replacing functions with does…

713a331

… from Support module.

Removed unneeded libraries, updated template to replace word node wit…

80bd039

…h pool, removed git modules that we don't need.

Adding recursive utilization calculation.

f9a4dab

Uh oh!

Conversation

rasovica commented Jun 25, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mitar commented Jun 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kostko Jun 29, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

robimarko commented Jun 27, 2017

Uh oh!

mitar commented Jun 27, 2017

Uh oh!

mitar commented Jun 27, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kostko Jun 29, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kostko commented Jun 29, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

rasovica commented Jun 25, 2017 •

edited

Loading

kostko Jun 29, 2017 •

edited

Loading

kostko Jun 29, 2017 •

edited

Loading