some minor changes/adaptions for test-fod-lab

flowspec/validators.py

@@ -18,7 +18,7 @@ def get_network(ip):
 
 
 def clean_ip(address):
-    if address.is_private:
+    if False and address.is_private:
             return _('Private addresses not allowed')
 
     if address.version == 4 and int(address.prefixlen) == 32:

flowspy/wsgi.py

@@ -16,6 +16,8 @@ framework.
 import os
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "flowspy.settings")
+os.environ['HTTPS'] = "on"
+os.environ['wsgi.url_scheme'] = 'https'
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION

requirements.txt

@@ -7,7 +7,7 @@ django-celery==2.5.5
 django-picklefield==0.2.1
 django-registration==0.8
 djangorestframework==2.3.14
-django-tinymce==1.5
+django-tinymce
 Django==1.4.5
 gevent==0.13.6
 git+https://code.grnet.gr/git/nxpy
@@ -21,9 +21,10 @@ MySQL-python==1.2.3
 ncclient==0.4.3
 paramiko==1.7.7.1
 pycrypto==2.6
-pyparsing==1.5.6
+pyparsing
 python-dateutil==1.5
 python-memcached==1.48
 PyYAML==3.10
 South==0.7.5
 wsgiref==0.1.2
+django-form-utils

templates/flowspy/route_details.html

@@ -68,15 +68,8 @@
         </div>
         <div>
             <h2>Statistics</h2>
-            <div><span id="traffic-plot-loading">(Loading data...)</span>
-            <h3>Number of packets (absolute)</h3>
-	    <div><canvas id="traffic-plot-pkts-abs" width=200 height=200></canvas></div>
-            <h3>Number of packets (relative)</h3>
-            <div><canvas id="traffic-plot-pkts-rel" width=200 height=200></canvas></div>
-            <h3>Number of bytes (absolute)</h3>
-	    <div><canvas id="traffic-plot-bytes-abs" width=200 height=200></canvas></div>
-            <h3>Number of bytes (relative)</h3>
-            <div><canvas id="traffic-plot-bytes-rel" width=200 height=200></canvas></div>
+            <div><canvas id="traffic-plot" width=550 height=150></canvas></div>
+            <div>Number of packets <span id="traffic-plot-loading">(Loading)</span>
         </div>
         <div><a href="{% url routestats route.name %}">Download raw data in JSON</a></div>
     </div>

utils/proxy.py

@@ -180,8 +180,9 @@ class Applier(object):
                 logger.info("Requesting a replace operation")
                 route.operation = operation
             device = device.export(netconf_config=True)
-            logger.debug(ET.tostring(device))
-            return ET.tostring(device)
+            result = ET.tostring(device)
+            logger.error(result)
+            return result
         else:
             return False