Commit 42b86150 authored by Stauros Kroustouris's avatar Stauros Kroustouris

Merge branch 'dev' of https://github.com/grnet/flowspy into dev

Conflicts:
	ChangeLog
	_version.py
	doc/index.md
	flowspec/models.py
	flowspec/views.py
	flowspy/settings.py.dist
parents b436bd51 7ae0e0ec
===========
=======
1.1.2 RELEASE
Updates and enhancements. Check documentation for updating from previous versions
......@@ -10,6 +10,7 @@ Updates and enhancements. Check documentation for updating from previous version
Minor changes release
- Change license to GPLv3
- Minor documentation updates
===========
......
......@@ -136,7 +136,7 @@ Get the required packages and their dependencies and install them:
cd nxpy
python setup.py install
- flowspy: core application. Installation is done at /srv/flowspy:
- flowspy: core web application. Installation is done at /srv/flowspy::
cd /srv
git clone https://code.grnet.gr/git/flowspy
......
......@@ -31,8 +31,10 @@ from ipaddr import *
import datetime
import logging
from time import sleep
from junos import create_junos_name
import beanstalkc
from utils.randomizer import id_generator as id_gen
......@@ -174,6 +176,10 @@ class Route(models.Model):
comments = models.TextField(null=True, blank=True, verbose_name=_("Comments"))
requesters_address = models.CharField(max_length=255, blank=True, null=True)
<<<<<<< HEAD
=======
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
def __unicode__(self):
return self.name
......@@ -188,6 +194,10 @@ class Route(models.Model):
self.name = "%s_%s" %(self.name, hash)
super(Route, self).save(*args, **kwargs) # Call the "real" save() method.
<<<<<<< HEAD
=======
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
def clean(self, *args, **kwargs):
from django.core.exceptions import ValidationError
if self.destination:
......@@ -207,6 +217,7 @@ class Route(models.Model):
peer = self.applier.get_profile().peer.peer_tag
send_message("[%s] Adding rule %s. Please wait..." % (self.applier.username, self.name), peer)
response = add.delay(self)
<<<<<<< HEAD
logger.info('Got add job id: %s' % response)
fqdn = Site.objects.get_current().domain
admin_url = 'https://%s%s' % (
......@@ -235,6 +246,9 @@ class Route(models.Model):
'user': self.applier.username
}
logger.info(mail_body, extra=d)
=======
logger.info("Got add job id: %s" %response)
>>>>>>> 7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
def commit_edit(self, *args, **kwargs):
peer = self.applier.get_profile().peer.peer_tag
......
# -*- coding: utf-8 -*- vim:fileencoding=utf-8:
# vim: tabstop=4:shiftwidth=4:softtabstop=4:expandtab
# Django settings for flowspy project.
# Copyright © 2011-2015 Greek Research and Technology Network (GRNET S.A.)
# Copyright © 2011-2014 Leonidas Poulopoulos (@leopoul)
# Copyright © 2014-2015 Stavros Kroustouris (@kroustou)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment