Merge branch 'master' into acl

Conflicts:
	circle/dashboard/urls.py
	circle/dashboard/views.py
	circle/vm/models.py

circle/common/models.py

+from django.contrib.auth.models import User
+from django.db.models import (CharField, DateTimeField, ForeignKey, TextField)
+from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+from model_utils.models import TimeStampedModel
+
+
+def activitycontextimpl(act):
+    try:
+        yield act
+    except Exception as e:
+        act.finish(str(e))
+        raise e
+    else:
+        act.finish()
+
+
+class ActivityModel(TimeStampedModel):
+    activity_code = CharField(max_length=100, verbose_name=_('activity code'))
+    parent = ForeignKey('self', blank=True, null=True)
+    task_uuid = CharField(blank=True, max_length=50, null=True, unique=True,
+                          help_text=_('Celery task unique identifier.'),
+                          verbose_name=_('task_uuid'))
+    user = ForeignKey(User, blank=True, null=True, verbose_name=_('user'),
+                      help_text=_('The person who started this activity.'))
+    started = DateTimeField(verbose_name=_('started at'),
+                            blank=True, null=True,
+                            help_text=_('Time of activity initiation.'))
+    finished = DateTimeField(verbose_name=_('finished at'),
+                             blank=True, null=True,
+                             help_text=_('Time of activity finalization.'))
+    result = TextField(verbose_name=_('result'), blank=True, null=True,
+                       help_text=_('Human readable result of activity.'))
+
+    class Meta:
+        abstract = True
+
+    def finish(self, result=None):
+        if not self.finished:
+            self.finished = timezone.now()
+            self.result = result
+            self.save()

circle/dashboard/static/dashboard/bootstrap-slider/bootstrap-slider.js

+/* =========================================================
+ * bootstrap-slider.js v2.0.0
+ * http://www.eyecon.ro/bootstrap-slider
+ * =========================================================
+ * Copyright 2012 Stefan Petre
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+ 
+!function( $ ) {
+
+	var Slider = function(element, options) {
+		this.element = $(element);
+		this.picker = $('<div class="slider">'+
+							'<div class="slider-track">'+
+								'<div class="slider-selection"></div>'+
+								'<div class="slider-handle"></div>'+
+								'<div class="slider-handle"></div>'+
+							'</div>'+
+							'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'+
+						'</div>')
+							.insertBefore(this.element)
+							.append(this.element);
+		this.id = this.element.data('slider-id')||options.id;
+		if (this.id) {
+			this.picker[0].id = this.id;
+		}
+
+		if (typeof Modernizr !== 'undefined' && Modernizr.touch) {
+			this.touchCapable = true;
+		}
+
+		var tooltip = this.element.data('slider-tooltip')||options.tooltip;
+
+		this.tooltip = this.picker.find('.tooltip');
+		this.tooltipInner = this.tooltip.find('div.tooltip-inner');
+
+		this.orientation = this.element.data('slider-orientation')||options.orientation;
+		switch(this.orientation) {
+			case 'vertical':
+				this.picker.addClass('slider-vertical');
+				this.stylePos = 'top';
+				this.mousePos = 'pageY';
+				this.sizePos = 'offsetHeight';
+				this.tooltip.addClass('right')[0].style.left = '100%';
+				break;
+			default:
+				this.picker
+					.addClass('slider-horizontal')
+					.css('width', this.element.outerWidth());
+				this.orientation = 'horizontal';
+				this.stylePos = 'left';
+				this.mousePos = 'pageX';
+				this.sizePos = 'offsetWidth';
+				this.tooltip.addClass('top')[0].style.top = -this.tooltip.outerHeight() - 14 + 'px';
+				break;
+		}
+
+		this.min = this.element.data('slider-min')||options.min;
+		this.max = this.element.data('slider-max')||options.max;
+		this.step = this.element.data('slider-step')||options.step;
+		this.value = this.element.data('slider-value')||options.value;
+		if (this.value[1]) {
+			this.range = true;
+		}
+
+		this.selection = this.element.data('slider-selection')||options.selection;
+		this.selectionEl = this.picker.find('.slider-selection');
+		if (this.selection === 'none') {
+			this.selectionEl.addClass('hide');
+		}
+		this.selectionElStyle = this.selectionEl[0].style;
+
+
+		this.handle1 = this.picker.find('.slider-handle:first');
+		this.handle1Stype = this.handle1[0].style;
+		this.handle2 = this.picker.find('.slider-handle:last');
+		this.handle2Stype = this.handle2[0].style;
+
+		var handle = this.element.data('slider-handle')||options.handle;
+		switch(handle) {
+			case 'round':
+				this.handle1.addClass('round');
+				this.handle2.addClass('round');
+				break
+			case 'triangle':
+				this.handle1.addClass('triangle');
+				this.handle2.addClass('triangle');
+				break
+		}
+
+		if (this.range) {
+			this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+			this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+		} else {
+			this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+			this.handle2.addClass('hide');
+			if (this.selection == 'after') {
+				this.value[1] = this.max;
+			} else {
+				this.value[1] = this.min;
+			}
+		}
+		this.diff = this.max - this.min;
+		this.percentage = [
+			(this.value[0]-this.min)*100/this.diff,
+			(this.value[1]-this.min)*100/this.diff,
+			this.step*100/this.diff
+		];
+
+		this.offset = this.picker.offset();
+		this.size = this.picker[0][this.sizePos];
+
+		this.formater = options.formater;
+
+		this.layout();
+
+		if (this.touchCapable) {
+			// Touch: Bind touch events:
+			this.picker.on({
+				touchstart: $.proxy(this.mousedown, this)
+			});
+		} else {
+			this.picker.on({
+				mousedown: $.proxy(this.mousedown, this)
+			});
+		}
+
+		if (tooltip === 'show') {
+			this.picker.on({
+				mouseenter: $.proxy(this.showTooltip, this),
+				mouseleave: $.proxy(this.hideTooltip, this)
+			});
+		} else {
+			this.tooltip.addClass('hide');
+		}
+	};
+
+	Slider.prototype = {
+		constructor: Slider,
+
+		over: false,
+		inDrag: false,
+		
+		showTooltip: function(){
+			this.tooltip.addClass('in');
+			//var left = Math.round(this.percent*this.width);
+			//this.tooltip.css('left', left - this.tooltip.outerWidth()/2);
+			this.over = true;
+		},
+		
+		hideTooltip: function(){
+			if (this.inDrag === false) {
+				this.tooltip.removeClass('in');
+			}
+			this.over = false;
+		},
+
+		layout: function(){
+			this.handle1Stype[this.stylePos] = this.percentage[0]+'%';
+			this.handle2Stype[this.stylePos] = this.percentage[1]+'%';
+			if (this.orientation == 'vertical') {
+				this.selectionElStyle.top = Math.min(this.percentage[0], this.percentage[1]) +'%';
+				this.selectionElStyle.height = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+			} else {
+				this.selectionElStyle.left = Math.min(this.percentage[0], this.percentage[1]) +'%';
+				this.selectionElStyle.width = Math.abs(this.percentage[0] - this.percentage[1]) +'%';
+			}
+			if (this.range) {
+				this.tooltipInner.text(
+					this.formater(this.value[0]) + 
+					' : ' + 
+					this.formater(this.value[1])
+				);
+				this.tooltip[0].style[this.stylePos] = this.size * (this.percentage[0] + (this.percentage[1] - this.percentage[0])/2)/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+			} else {
+				this.tooltipInner.text(
+					this.formater(this.value[0])
+				);
+				this.tooltip[0].style[this.stylePos] = this.size * this.percentage[0]/100 - (this.orientation === 'vertical' ? this.tooltip.outerHeight()/2 : this.tooltip.outerWidth()/2) +'px';
+			}
+		},
+
+		mousedown: function(ev) {
+
+			// Touch: Get the original event:
+			if (this.touchCapable && ev.type === 'touchstart') {
+				ev = ev.originalEvent;
+			}
+
+			this.offset = this.picker.offset();
+			this.size = this.picker[0][this.sizePos];
+
+			var percentage = this.getPercentage(ev);
+
+			if (this.range) {
+				var diff1 = Math.abs(this.percentage[0] - percentage);
+				var diff2 = Math.abs(this.percentage[1] - percentage);
+				this.dragged = (diff1 < diff2) ? 0 : 1;
+			} else {
+				this.dragged = 0;
+			}
+
+			this.percentage[this.dragged] = percentage;
+			this.layout();
+
+			if (this.touchCapable) {
+				// Touch: Bind touch events:
+				$(document).on({
+					touchmove: $.proxy(this.mousemove, this),
+					touchend: $.proxy(this.mouseup, this)
+				});
+			} else {
+				$(document).on({
+					mousemove: $.proxy(this.mousemove, this),
+					mouseup: $.proxy(this.mouseup, this)
+				});
+			}
+
+			this.inDrag = true;
+			var val = this.calculateValue();
+			this.element.trigger({
+					type: 'slideStart',
+					value: val
+				}).trigger({
+					type: 'slide',
+					value: val
+				});
+			return false;
+		},
+
+		mousemove: function(ev) {
+			
+			// Touch: Get the original event:
+			if (this.touchCapable && ev.type === 'touchmove') {
+				ev = ev.originalEvent;
+			}
+
+			var percentage = this.getPercentage(ev);
+			if (this.range) {
+				if (this.dragged === 0 && this.percentage[1] < percentage) {
+					this.percentage[0] = this.percentage[1];
+					this.dragged = 1;
+				} else if (this.dragged === 1 && this.percentage[0] > percentage) {
+					this.percentage[1] = this.percentage[0];
+					this.dragged = 0;
+				}
+			}
+			this.percentage[this.dragged] = percentage;
+			this.layout();
+			var val = this.calculateValue();
+			this.element
+				.trigger({
+					type: 'slide',
+					value: val
+				})
+				.data('value', val)
+				.prop('value', val);
+			return false;
+		},
+
+		mouseup: function(ev) {
+			if (this.touchCapable) {
+				// Touch: Bind touch events:
+				$(document).off({
+					touchmove: this.mousemove,
+					touchend: this.mouseup
+				});
+			} else {
+				$(document).off({
+					mousemove: this.mousemove,
+					mouseup: this.mouseup
+				});
+			}
+
+			this.inDrag = false;
+			if (this.over == false) {
+				this.hideTooltip();
+			}
+			this.element;
+			var val = this.calculateValue();
+			this.element
+				.trigger({
+					type: 'slideStop',
+					value: val
+				})
+				.data('value', val)
+				.prop('value', val);
+			return false;
+		},
+
+		calculateValue: function() {
+			var val;
+			if (this.range) {
+				val = [
+					(this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step),
+					(this.min + Math.round((this.diff * this.percentage[1]/100)/this.step)*this.step)
+				];
+				this.value = val;
+			} else {
+				val = (this.min + Math.round((this.diff * this.percentage[0]/100)/this.step)*this.step);
+				this.value = [val, this.value[1]];
+			}
+			return val;
+		},
+
+		getPercentage: function(ev) {
+			if (this.touchCapable) {
+				ev = ev.touches[0];
+			}
+			var percentage = (ev[this.mousePos] - this.offset[this.stylePos])*100/this.size;
+			percentage = Math.round(percentage/this.percentage[2])*this.percentage[2];
+			return Math.max(0, Math.min(100, percentage));
+		},
+
+		getValue: function() {
+			if (this.range) {
+				return this.value;
+			}
+			return this.value[0];
+		},
+
+		setValue: function(val) {
+			this.value = val;
+
+			if (this.range) {
+				this.value[0] = Math.max(this.min, Math.min(this.max, this.value[0]));
+				this.value[1] = Math.max(this.min, Math.min(this.max, this.value[1]));
+			} else {
+				this.value = [ Math.max(this.min, Math.min(this.max, this.value))];
+				this.handle2.addClass('hide');
+				if (this.selection == 'after') {
+					this.value[1] = this.max;
+				} else {
+					this.value[1] = this.min;
+				}
+			}
+			this.diff = this.max - this.min;
+			this.percentage = [
+				(this.value[0]-this.min)*100/this.diff,
+				(this.value[1]-this.min)*100/this.diff,
+				this.step*100/this.diff
+			];
+			this.layout();
+		}
+	};
+
+	$.fn.slider = function ( option, val ) {
+		return this.each(function () {
+			var $this = $(this),
+				data = $this.data('slider'),
+				options = typeof option === 'object' && option;
+			if (!data)  {
+				$this.data('slider', (data = new Slider(this, $.extend({}, $.fn.slider.defaults,options))));
+			}
+			if (typeof option == 'string') {
+				data[option](val);
+			}
+		})
+	};
+
+	$.fn.slider.defaults = {
+		min: 0,
+		max: 10,
+		step: 1,
+		orientation: 'horizontal',
+		value: 5,
+		selection: 'before',
+		tooltip: 'show',
+		handle: 'round',
+		formater: function(value) {
+			return value;
+		}
+	};
+
+	$.fn.slider.Constructor = Slider;
+
+}( window.jQuery );
\ No newline at end of file

circle/dashboard/static/dashboard/bootstrap-slider/less/slider.less

+/*!
+ * Slider for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+
+.slider {
+	display: inline-block;
+	vertical-align: middle;
+	position: relative;
+	&.slider-horizontal {
+		width: 210px;
+		height: @baseLineHeight;
+		.slider-track {
+			height: @baseLineHeight/2;
+			width: 100%;
+			margin-top: -@baseLineHeight/4;
+			top: 50%;
+			left: 0;
+		}
+		.slider-selection {
+			height: 100%;
+			top: 0;
+			bottom: 0;
+		}
+		.slider-handle {
+			margin-left: -@baseLineHeight/2;
+			margin-top: -@baseLineHeight/4;
+			&.triangle {
+    			border-width: 0 @baseLineHeight/2 @baseLineHeight/2 @baseLineHeight/2;
+				width: 0;
+				height: 0;
+				border-bottom-color: #0480be;
+				margin-top: 0;
+			}
+		}
+	}
+	&.slider-vertical {
+		height: 210px;
+		width: @baseLineHeight;
+		.slider-track {
+			width: @baseLineHeight/2;
+			height: 100%;
+			margin-left: -@baseLineHeight/4;
+			left: 50%;
+			top: 0;
+		}
+		.slider-selection {
+			width: 100%;
+			left: 0;
+			top: 0;
+			bottom: 0;
+		}
+		.slider-handle {
+			margin-left: -@baseLineHeight/4;
+			margin-top: -@baseLineHeight/2;
+			&.triangle {
+				border-width: @baseLineHeight/2 0 @baseLineHeight/2 @baseLineHeight/2;
+				width: 1px;
+				height: 1px;
+				border-left-color: #0480be;
+				margin-left: 0;
+			}
+		}
+	}
+	input {
+		display: none;
+	}
+	.tooltip-inner {
+		white-space: nowrap;
+	}
+}
+.slider-track {
+	position: absolute;
+	cursor: pointer;
+	#gradient > .vertical(#f5f5f5, #f9f9f9);
+	.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+	.border-radius(@baseBorderRadius);
+}
+.slider-selection {
+	position: absolute;
+	#gradient > .vertical(#f9f9f9, #f5f5f5);
+	.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+	.box-sizing(border-box);
+	.border-radius(@baseBorderRadius);
+}
+.slider-handle {
+	position: absolute;
+	width: @baseLineHeight;
+	height: @baseLineHeight;
+	#gradient > .vertical(#149bdf, #0480be);
+	.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+	opacity: 0.8;
+	border: 0px solid transparent;
+	&.round {
+		.border-radius(@baseLineHeight);
+	}
+	&.triangle {
+		background: transparent none;
+	}
+}
\ No newline at end of file

circle/dashboard/static/dashboard/bootstrap-slider/slider.css

+/*!
+ * Slider for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+.slider {
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+}
+.slider.slider-horizontal {
+  width: 210px;
+  height: 20px;
+}
+.slider.slider-horizontal .slider-track {
+  height: 10px;
+  width: 100%;
+  margin-top: -5px;
+  top: 50%;
+  left: 0;
+}
+.slider.slider-horizontal .slider-selection {
+  height: 100%;
+  top: 0;
+  bottom: 0;
+}
+.slider.slider-horizontal .slider-handle {
+  margin-left: -10px;
+  margin-top: -5px;
+}
+.slider.slider-horizontal .slider-handle.triangle {
+  border-width: 0 10px 10px 10px;
+  width: 0;
+  height: 0;
+  border-bottom-color: #0480be;
+  margin-top: 0;
+}
+.slider.slider-vertical {
+  height: 210px;
+  width: 20px;
+}
+.slider.slider-vertical .slider-track {
+  width: 10px;
+  height: 100%;
+  margin-left: -5px;
+  left: 50%;
+  top: 0;
+}
+.slider.slider-vertical .slider-selection {
+  width: 100%;
+  left: 0;
+  top: 0;
+  bottom: 0;
+}
+.slider.slider-vertical .slider-handle {
+  margin-left: -5px;
+  margin-top: -10px;
+}
+.slider.slider-vertical .slider-handle.triangle {
+  border-width: 10px 0 10px 10px;
+  width: 1px;
+  height: 1px;
+  border-left-color: #0480be;
+  margin-left: 0;
+}
+.slider input {
+  display: none;
+}
+.slider .tooltip-inner {
+  white-space: nowrap;
+}
+.slider-track {
+  position: absolute;
+  cursor: pointer;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.slider-selection {
+  position: absolute;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f9f9f9, #f5f5f5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f9f9f9, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f9f9f9, #f5f5f5);
+  background-image: linear-gradient(to bottom, #f9f9f9, #f5f5f5);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.slider-handle {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  opacity: 0.8;
+  border: 0px solid transparent;
+}
+.slider-handle.round {
+  -webkit-border-radius: 20px;
+  -moz-border-radius: 20px;
+  border-radius: 20px;
+}
+.slider-handle.triangle {
+  background: transparent none;
+}
+
+/* custom */
+
+.slider-handle, .slider-handle:hover {
+    background-color: #3071a9;
+    opacity: 1;
+    width: 8px;
+    height: 26px;
+    margin-top: -4px!important;
+    margin-left: -6px !important;
+  
+     border-radius: 0px;
+    -moz-border-radius: 0px;
+    -webkit-border-radius: 0px;    
+
+    text-shadow: 0 1px 0 #fff;
+    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+    background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+    background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+    background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+    background-repeat: repeat-x;
+    border-color: #2d6ca2;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.slider-handle:hover {
+    background: #428bca;
+    background-image: none;
+    border-color: #2d6ca2;
+}
+
+
+.slider-track, .slider-selection {
+    height: 20px !important;
+      background: #ccc;
+  background: -webkit-linear-gradient(top, #bbb, #ddd);
+  background: -moz-linear-gradient(top, #bbb, #ddd);
+  background: linear-gradient(top, #bbb, #ddd);
+
+  -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,0.1);
+  -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.1);
+  box-shadow: inset 0 2px 4px rgba(0,0,0,0.1);
+
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+
+  border: 1px solid #aaa;
+}
+
+
+.slider-selection {
+    background-color: #8DCA09;
+  background: -webkit-linear-gradient(top, #8DCA09, #72A307);
+  background: -moz-linear-gradient(top, #8DCA09, #72A307);
+  background: linear-gradient(top, #8DCA09, #72A307);
+  border-color: #496805;
+}
+
+.vm-slider {
+    width: 300px;   
+}
+
+.output {
+  padding-left: 10px;
+  font-weight: bold;
+} 

circle/dashboard/static/dashboard/dashboard.js

 $(function () {
+  $('.vm-create').click(function(e) {
+    $.ajax({
+      type: 'GET',
+      url: '/dashboard/vm/create/', 
+      success: function(data) { 
+        $('body').append(data);
+        vmCreateLoaded();
+        addSliderMiscs();
+        $('#vm-create-modal').modal('show');
+        $('#vm-create-modal').on('hidden.bs.modal', function() {
+          $('#vm-create-modal').remove();
+        });
+      }
+    });
+    return false;
+  });
   $('[href=#vm-graph-view]').click(function (e) {
     $('#vm-list-view').hide();
     $('#vm-graph-view').show();
@@ -18,26 +34,31 @@ $(function () {
   $('[title]').tooltip();
   $(':input[title]').tooltip({trigger: 'focus', placement: 'auto right'});
   $(".knob").knob();
-  $("[data-slider]")
-    .each(function () {
-      var input = $(this);
-      $("<span>")
-        .addClass("output")
-        .html($(this).val())
-        .insertAfter(input);
-    })
-    .bind("slider:ready slider:changed", function (event, data) {
-      $(this)
-        .nextAll(".output:first")
-          .html(data.value.toFixed(3));
-    });
-    $("[data-mark]")
-        .each(function () {
-            var value=$(this).attr('data-mark').parseFloat();
-
   
-        });
   if (window.location.hash)
     $("a[href=" + window.location.hash +"]").tab('show');
+
+  addSliderMiscs();
 });
 
+function addSliderMiscs() {
+  $('.vm-slider').each(function() {  
+    $("<span>").addClass("output").html($(this).val()).insertAfter($(this));
+  });                                                                   
+                                                                            
+  $('.vm-slider').slider()                                              
+  .on('slide', function(e) {                                            
+    $(this).val(e.value);
+    $(this).parent('div').nextAll("span").html(e.value)                 
+  });
+
+  refreshSliders();
+}
+
+// ehhh
+function refreshSliders() {
+  $('.vm-slider').each(function() {
+    $(this).val($(this).slider().data('slider').getValue());
+    $(this).parent('div').nextAll("span").html($(this).val());
+  });
+}

circle/dashboard/static/dashboard/vm-create.js

+var vlans = [];
+var disks = [];
+
+$(function() {
+  vmCreateLoaded();
+});
+
+function vmCreateLoaded() {
+  // temporarily disable for testing
+  //$('.vm-create-advanced').hide();
+  $('.vm-create-advanced-btn').click(function() {
+    $('.vm-create-advanced').stop().slideToggle();
+    if ($('.vm-create-advanced-icon').hasClass('icon-caret-down')) {
+      $('.vm-create-advanced-icon').removeClass('icon-caret-down').addClass('icon-caret-up');
+    } else { 
+      $('.vm-create-advanced-icon').removeClass('icon-caret-up').addClass('icon-caret-down');
+    } 
+  });
+  
+  $('#vm-create-template-select').change(function() {
+    vmCreateTemplateChange(this);
+  });
+ 
+  /* network thingies */
+
+  /* add network */
+  $('#vm-create-network-add-button').click(function() {
+    var vlan_pk = $('#vm-create-network-add-select :selected').val();
+    var managed = $('#vm-create-network-add-checkbox-managed').prop('checked');
+    var name = $('#vm-create-network-add-select :selected').text();
+
+    if ($('#vm-create-network-list').children('span').length < 1) { 
+      $('#vm-create-network-list').html('');
+    }  
+    $('#vm-create-network-list').append(
+      vmCreateNetworkLabel(vlan_pk, name, managed)
+    );
+
+    /* select the network from the managed/unmanaged multiple select */
+    if(managed) {
+      $('#vm-create-network-add-managed option[value="' + vlan_pk + '"]').prop('selected', true);
+    } else {
+      $('#vm-create-network-add-unmanaged option[value="' + vlan_pk + '"]').prop('selected', true);
+    }
+
+    $('option:selected', $('#vm-create-network-add-select')).remove();
+    
+    /* add dummy text if no more networks are available */
+    if($('#vm-create-network-add-select option').length < 1) {
+      $('#vm-create-network-add-button').attr('disabled', true);
+      $('#vm-create-network-add-select').html('<option value="-1">We are out of &lt;options&gt; hehe</option>');
+    }
+
+    return false;
+  });
+
+  /* remove network */
+  // event for network remove button (icon, X)
+  $('body').on('click', '.vm-create-remove-network', function() {
+    var vlan_pk = ($(this).parent('span').prop('id')).replace('vlan-', '')
+    // if it's "blue" then it's managed, kinda not cool
+    var managed = $(this).parent('span').hasClass('label-primary');
+
+    $(this).parent('span').fadeOut(500, function() {
+      /* if ther are no more vlans disabled the add button */
+      if($('#vm-create-network-add-select option')[0].value == -1) {   
+        $('#vm-create-network-add-button').attr('disabled', false);            
+        $('#vm-create-network-add-select').html('');
+      }
+      
+      /* remove the network label */
+      $(this).remove(); 
+
+      var vlan_name = $(this).text();
+      $('#vm-create-network-add-select').append($('<option>', {
+        value: vlan_pk,
+        text: vlan_name
+      }));
+
+      /* remove the selection from the multiple select */
+      $('#vm-create-network-add-' + (managed ? '' : 'un') + 'managed option[value="' + vlan_pk + '"]').prop('selected', false);
+      if ($('#vm-create-network-list').children('span').length < 1) {
+        $('#vm-create-network-list').append('Not added to any network!');
+      }
+    });
+    return false;
+  });
+
+  /* copy networks from hidden select */
+  $('#vm-create-network-add-select').html($('#vm-create-network-add-managed').html());
+
+
+  /* build up network list */
+  $('#vm-create-network-add-select option').each(function() {
+    vlans.push({
+      'name': $(this).text(),
+      'pk': parseInt($(this).val())
+    });
+  });
+
+  /* ----- end of networks thingies ----- */
+
+
+  /* add disk */
+  $('#vm-create-disk-add-button').click(function() {
+    var disk_pk = $('#vm-create-disk-add-select :selected').val();
+    var name = $('#vm-create-disk-add-select :selected').text();
+
+    if ($('#vm-create-disk-list').children('span').length < 1) { 
+      $('#vm-create-disk-list').html('');
+    }  
+    $('#vm-create-disk-list').append(
+      vmCreateDiskLabel(disk_pk, name)
+    );
+
+    /* select the disk from the multiple select */
+    $('#vm-create-disk-add-form option[value="' + disk_pk + '"]').prop('selected', true);
+
+    $('option:selected', $('#vm-create-disk-add-select')).remove();
+    
+    /* add dummy text if no more disks are available */
+    if($('#vm-create-disk-add-select option').length < 1) {
+      $('#vm-create-disk-add-button').attr('disabled', true);
+      $('#vm-create-disk-add-select').html('<option value="-1">We are out of &lt;options&gt; hehe</option>');
+    }
+
+    return false;
+  });
+
+
+  /* remove disk */
+  // event for disk remove button (icon, X)
+  $('body').on('click', '.vm-create-remove-disk', function() {
+    var disk_pk = ($(this).parent('span').prop('id')).replace('vlan-', '')
+
+    $(this).parent('span').fadeOut(500, function() {
+      /* if ther are no more disks disabled the add button */
+      if($('#vm-create-disk-add-select option')[0].value == -1) {   
+        $('#vm-create-disk-add-button').attr('disabled', false);            
+        $('#vm-create-disk-add-select').html('');
+      }
+      
+      /* remove the disk label */
+      $(this).remove(); 
+
+      var disk_name = $(this).text();
+      $('#vm-create-disk-add-select').append($('<option>', {
+        value: disk_pk,
+        text: disk_name
+      }));
+
+      /* remove the selection from the multiple select */
+      $('#vm-create-disk-add-form option[value="' + disk_pk + '"]').prop('selected', false);
+      if ($('#vm-create-disk-list').children('span').length < 1) {
+        $('#vm-create-disk-list').append('No disks are added!');
+      }
+    });
+    return false;
+  });
+
+  /* copy disks from hidden select */
+  $('#vm-create-disk-add-select').html($('#vm-create-disk-add-form').html());
+
+
+  /* build up disk list */
+  $('#vm-create-disk-add-select option').each(function() {
+    disks.push({
+      'name': $(this).text(),
+      'pk': parseInt($(this).val())
+    });
+  });
+
+  /* add button */
+  $('#vm-create-submit').click(function() {
+    $.ajax({
+      url: '/dashboard/vm/create/',
+      headers: {"X-CSRFToken": getCookie('csrftoken')},
+      type: 'POST',
+      data: $('form').serialize(),
+      success: function(data, textStatus, xhr) {
+        console.log(data);
+      }
+    });
+    return false;
+  });
+
+  /* no js compatibility */
+  $('.no-js-hidden').show();
+  $('.js-hidden').hide();
+}
+
+function vmCreateTemplateChange(new_this) {
+  this.value = new_this.value;
+  if(this.value < 0) return;
+  $.ajax({
+    url: '/dashboard/template/' + this.value,
+    type: 'GET',
+    success: function(data, textStatus, xhr) {
+      if(xhr.status == 200) {
+        // set sliders
+        $('#vm-cpu-priority-slider').slider("setValue", data['priority']);
+        $('#vm-cpu-count-slider').slider("setValue", data['num_cores']);
+        $('#vm-ram-size-slider').slider("setValue", data['ram_size']);
+        
+        /* slider doesn't have change event ........................ */
+        refreshSliders();
+
+        /* clear selections */
+        $('select[id^="vm-create-network-add"], select[id$="managed"]').find('option').prop('selected', false);
+         $('#vm-create-disk-add-form').find('option').prop('selected', false);
+
+        /* append vlans from InterfaceTemplates */
+        $('#vm-create-network-list').html('');
+        var added_vlans = []
+        for(var n = 0; n<data['network'].length; n++) {
+          nn = data['network'][n]
+          $('#vm-create-network-list').append(
+              vmCreateNetworkLabel(nn.vlan_pk, nn.vlan, nn.managed)
+          );
+          
+          $('#vm-create-network-add-' + (nn.managed ? '' : 'un') + 'managed option[value="' + nn.vlan_pk + '"]').prop('selected', true);
+          added_vlans.push(nn.vlan_pk);
+        }
+
+        /* remove already added vlans from dropdown or add new ones */
+        $('#vm-create-network-add-select').html('');
+        for(var i=0; i < vlans.length; i++)
+          if(added_vlans.indexOf(vlans[i].pk) == -1)
+            $('#vm-create-network-add-select').append($('<option>', {
+              value: vlans[i].pk,                                                     
+              text: vlans[i].name                                                     
+            }));
+       
+        /* enalbe the network add button if there are not added vlans */
+        if(added_vlans.length != vlans.length) {
+          $('#vm-create-network-add-button').attr('disabled', false);
+        } else {
+          $('#vm-create-network-add-select').html('<option value="-1">We are out of &lt;options&gt; hehe</option>');
+          $('#vm-create-network-add-button').attr('disabled', true);
+        }
+
+
+        /* append disks */
+        $('#vm-create-disk-list').html('');
+        var added_disks = []
+        for(var d = 0; d<data['disks'].length; d++) {
+          dd = data['disks'][d]
+          $('#vm-create-disk-list').append(
+              vmCreateDiskLabel(dd.pk, dd.name)
+          );
+          
+          $('#vm-create-disk-add-form option[value="' + dd.pk + '"]').prop('selected', true);
+          added_disks.push(dd.pk);
+        }
+
+        /* remove already added disks from dropdown or add new ones */
+        $('#vm-create-disk-add-select').html('');
+        for(var i=0; i < disks.length; i++)
+          if(added_disks.indexOf(disks[i].pk) == -1)
+            $('#vm-create-disk-add-select').append($('<option>', {
+              value: disks[i].pk,                                                     
+              text: disks[i].name                                                     
+            }));
+       
+        /* enalbe the disk add button if there are not added disks */
+        if(added_disks.length != disks.length) {
+          $('#vm-create-disk-add-button').attr('disabled', false);
+        } else {
+          $('#vm-create-disk-add-select').html('<option value="-1">We are out of &lt;options&gt; hehe</option>');
+          $('#vm-create-disk-add-button').attr('disabled', true);
+        }
+      }
+    }
+  });
+}
+
+function vmCreateNetworkLabel(pk, name, managed) {
+  return '<span id="vlan-' + pk + '" class="label label-' +  (managed ? 'primary' : 'default')  + '"><i class="icon-' + (managed ? 'globe' : 'link') + '"></i> ' + name + ' <a href="#" class="hover-black vm-create-remove-network"><i class="icon-remove-sign"></i></a></span> ';
+}
+
+
+function vmCreateDiskLabel(pk, name) {
+  return '<span id="vlan-' + pk + '" class="label label-primary"><i class="icon-file"></i> ' + name + ' <a href="#" class="hover-black vm-create-remove-disk"><i class="icon-remove-sign"></i></a></span> ';
+}
+
+
+/* copied from /static/js/network.js 
+ * we gonna need this anyways for ajax POSTs */
+// for AJAX calls
+
+/**                                                                         
+ * Getter for user cookies                                                  
+ * @param  {String} name Cookie name                                        
+ * @return {String}      Cookie value                                       
+ */                                                                         
+                                                                            
+function getCookie(name) {                                                  
+  var cookieValue = null;                                                   
+  if (document.cookie && document.cookie != '') {                           
+    var cookies = document.cookie.split(';');                               
+    for (var i = 0; i < cookies.length; i++) {                              
+      var cookie = jQuery.trim(cookies[i]);                                 
+      if (cookie.substring(0, name.length + 1) == (name + '=')) {           
+        cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+        break;                                                              
+      }                                                                     
+    }                                                                       
+  }                                                                         
+  return cookieValue;                                                       
+} 

circle/dashboard/templates/dashboard/base.html

@@ -15,9 +15,8 @@
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
     <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
     <script src="{{ STATIC_URL }}dashboard/js/jquery.knob.js"></script>
-    <link href="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider-fa64f59/css/simple-slider.css" rel="stylesheet">
-    <script src="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider-fa64f59/js/simple-slider.min.js"></script>
-
+    <script src="{{ STATIC_URL}}dashboard/bootstrap-slider/bootstrap-slider.js"></script>
+    <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/bootstrap-slider/slider.css"/>
     <link href="{{ STATIC_URL }}dashboard/dashboard.css" rel="stylesheet">
     <script src="{{ STATIC_URL }}dashboard/dashboard.js"></script>
   </head>
@@ -39,9 +38,6 @@
     </div> <!-- /container -->
 
   </body>
-  <script>
 {% block extra_js %}
-
 {% endblock %}
-  </script>
 </html>

circle/dashboard/templates/dashboard/index-vm.html

@@ -15,51 +15,43 @@
   <div class="list-group" id="vm-list-view">
     {% for i in instances %}
     <a href="{{ i.get_absolute_url }}" class="list-group-item">
-	      <i class="icon-play-sign"></i> {{ i.name }} <div class="pull-right"><i class="icon-star text-primary" title="Mark as favorite."></i></div>
+      <i class="icon-{% if i.state == "RUNNING" %}play-sign{% else %}pause{% endif %}"></i> {{ i.name }} <div class="pull-right"><i class="icon-star text-primary" title="Mark as favorite."></i></div>
       </a>
     {% endfor %}
-    <a href="vm/443" class="list-group-item">
-      <i class="icon-play-sign"></i> ALMA <div class="pull-right"><i class="icon-star text-primary" title="Mark as favorite."></i></div>
-    </a>
-    <a href="#" class="list-group-item">
-      <i class="icon-play-sign"></i> ALMA <div class="pull-right"><i class="icon-star text-primary" title="Mark as favorite."></i></div>
-    </a>
-    <a href="#" class="list-group-item">
-      <i class="icon-play-sign"></i> ALMA <div class="pull-right"><i class="icon-star text-primary" title="Mark as favorite."></i></div>
-    </a>
-    <a href="#" class="list-group-item">
-      <i class="icon-off"></i> ALMA <div class="pull-right"><i class="icon-star-empty text-muted"></i></div>
-    </a>
     <div href="#" class="list-group-item list-group-footer">
       <div class="row">
-        <div class="col-sm-6 input-group input-group-sm">
+        <div class="col-sm-6 col-xs-6 input-group input-group-sm">
           <input type="text" class="form-control" placeholder="Search..." />
           <div class="input-group-btn">
             <button type="submit" class="form-control btn btn-primary" title="search"><i class="icon-search"></i></button>
           </div>
         </div>
         <div class="col-sm-6 text-right">
-          <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.vm-list" %}"><i class="icon-chevron-sign-right"></i> <strong>13</strong>  more  </a>
-          <a class="btn btn-success btn-xs"><i class="icon-plus-sign"></i> new </a>
+          {% if more_instances > 0 %}
+          <a class="btn btn-primary btn-xs" href="{% url "dashboard.views.vm-list" %}">
+            <i class="icon-chevron-sign-right"></i> <strong>{{ more_instances }}</strong>  more  
+          </a>
+          {% endif %}
+          <a class="btn btn-success btn-xs vm-create" href="{% url "dashboard.views.vm-create" %}"><i class="icon-plus-sign"></i> new </a>
         </div>
       </div>
     </div>
   </div>
   <div class="panel-body" id="vm-graph-view" style="display: none">
-    <p class="pull-right">  <input class="knob" data-fgColor="chartreuse" data-thickness=".4" data-width="100" data-height="100" data-readOnly="true" value="22"></p>
-    <p><span class="bigbig"><big>13</big> running </span>
+    <p class="pull-right">  <input class="knob" data-fgColor="chartreuse" data-thickness=".4" data-max="10" data-width="100" data-height="100" data-readOnly="true" value="{{ instances|length|add:more_instances }}"></p>
+    <p><span class="bigbig"><big>{{ running_vm_num }}</big> running </span>
       <ul class="list-inline">
-        <li class="label label-success"><i class="icon-play-sign"></i> szilva</li>
-        <li class="label label-success"><i class="icon-play-sign"></i> korte</li>
-        <li class="label label-success"><i class="icon-play-sign"></i> cseresznye</li>
+        {% for vm in running_vms %}
+          <li class="label label-success"><i class="icon-play-sign"></i> {{ vm.name}}</li>
+        {% endfor %}
       </ul>
     </p>
-    <p class="big text-warning"><big>10</big> stopped</p>
+    <p class="big text-warning"><big>{{ stopped_vm_num }}</big> stopped</p>
     <p>Total: $3000 </p>
 
     <div class="clearfix"></div>
     <div class="text-right">
-      <a class="btn btn-primary btn-xs"><i class="icon-chevron-sign-right"></i> <strong>13</strong>  more  </a> 
+      <a href="{% url "dashboard.views.vm-list" %}" class="btn btn-primary btn-xs"><i class="icon-chevron-sign-right"></i> <strong>{{ instances|length|add:more_instances }}</strong>  machines  total</a> 
     </div>
   </div>
 </div>

circle/dashboard/templates/dashboard/index.html

@@ -28,6 +28,8 @@
     </div>
   </div>
 </div>
+{% endblock %}
 
-
+{% block extra_js %}
+  <script src="{{ STATIC_URL }}dashboard/vm-create.js"></script>   
 {% endblock %}

circle/dashboard/templates/dashboard/modal-wrapper.html

+<div class="modal fade" id="vm-create-modal" tabindex="-1" role="dialog"> 
+  <div class="modal-dialog"> 
+    <div class="modal-content"> 
+      <div class="modal-header"> 
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> 
+        <h4 class="modal-title">{{ box_title }}</h4> 
+      </div> 
+      <div class="modal-body">  
+        {% include template %}
+      </div> 
+      <!--<div class="modal-footer"> 
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> 
+        <button type="button" class="btn btn-primary">Save changes</button> 
+      </div>-->
+    </div><!-- /.modal-content --> 
+  </div><!-- /.modal-dialog --> 
+</div>

circle/dashboard/templates/dashboard/nojs-wrapper.html

+{% extends "dashboard/base.html" %}
+
+{% block content %}
+  <div class="body-content">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="no-margin">
+          {{ box_title }}
+        </h3>
+      </div>
+      <div class="panel-body">
+        {% include template %}
+      </div>
+  </div>
+{% endblock %}
+
+{% block extra_js %}
+  {% if template == "dashboard/vm-create.html" %}
+    <script src="{{ STATIC_URL }}dashboard/vm-create.js"></script>
+  {% endif %}
+{% endblock %}

circle/dashboard/templates/dashboard/vm-create.html

+<style>
+  .row {
+    margin-bottom: 15px;
+  }
+</style>
+<form method="POST" action="/dashboard/vm/create/">
+{% csrf_token %}
+<div class="row">
+  <div class="col-sm-10">
+  <select class="select form-control" id="vm-create-template-select" name="template-pk">
+    <option value="-1">Choose a VM template</option>
+    {% for template in templates %}
+      <option value="{{ template.pk }}">{{ template.name}}</option>
+    {% endfor %}
+  </select>
+  </div>
+</div> 
+
+<div class="row">
+  <div class="col-sm-5">
+    <a class="btn btn-info vm-create-advanced-btn">Advanced <i class="vm-create-advanced-icon icon-caret-down"></i></a>
+  </div>
+  <div class="col-sm-5 text-right">
+    <button id="vm-create-submit" type="submit" class="btn btn-success "><i class="icon-play"></i> Start</button>
+  </div>
+</div>
+
+<div class="vm-create-advanced">
+  <div class="row">
+    <div class="col-sm-12">
+      <h2>Resources</h2>
+    </div>
+    {% include "dashboard/vm-detail-resources.html" %}
+  </div>
+
+  <!-- disk -->
+  <div class="row">
+    <div class="col-sm-4">
+      <h2>Disks</h2>
+    </div>
+    <div class="col-sm-8" style="padding-top: 3px;">
+      <div class="js-hidden" style="padding-top: 15px; max-width: 450px;">
+        <select class="form-control" id="vm-create-disk-add-form" multiple name="disks">
+          {% for d in disks %}
+            <option value="{{ d.pk }}">{{ d.name }}</option>
+          {% endfor %}
+        </select>
+      </div>
+      <div class="no-js-hidden">
+        <h3 id="vm-create-disk-list">
+          No disks are added!
+        </h3>
+        <h3 id="vm-create-disk-add">
+          <div class="input-group" style="max-width: 330px;">
+            <select class="form-control" id="vm-create-disk-add-select">         
+              <!-- options should be copied via js from above -->
+            </select>
+            <div class="input-group-btn">
+              <!--<input type="submit" value="Add to network" class="btn btn-success"/>-->
+              <a href="#" id="vm-create-disk-add-button" class="btn btn-success"><i class="icon-plus-sign"></i></a>
+            </div>
+          </div>
+        </h3>
+      </div>
+    </div>
+  </div>
+
+  <!-- network -->
+  <div class="row">
+    <div class="col-sm-4">
+      <h2>Network</h2> 
+    </div>
+    <style>
+      /* temporary inline css for dev */
+      a.hover-black {
+        color:white;
+      }
+
+      .hover-black:hover {
+        color: black /*#d9534f*/;
+        text-decoration: none;
+      }
+
+      .no-js-hidden {
+        display: none;
+      }
+    </style>
+    <div class="col-sm-8" style="padding-top: 3px;">
+      <div class="js-hidden" style="padding-top: 15px; max-width: 450px;">
+        <h4>Managed networks</h4>
+        <select class="form-control" id="vm-create-network-add-managed" multiple name="managed-vlans">
+          {% for v in vlans %}
+            <option value="{{ v.pk }}">{{ v.name }}</option>
+          {% endfor %}
+        </select>
+
+        <h4>Unmanaged networks</h4>
+        <select class="form-control" id="vm-create-network-add-unmanaged" multiple name="unmanaged-vlans">
+          {% for v in vlans %}
+            <option value="{{ v.pk }}">{{ v.name }}</option>
+          {% endfor %}
+        </select>
+      </div>
+      <div class="no-js-hidden">
+        <h3 id="vm-create-network-list">
+          Not added to any network!
+        </h3>
+        <h3 id="vm-create-network-add">
+          <div class="input-group" style="max-width: 330px;">
+            <select class="form-control" id="vm-create-network-add-select">         
+              <!-- options should be copied via js from above -->
+            </select>
+            <span class="input-group-addon">
+              <input id="vm-create-network-add-checkbox-managed" type="checkbox" title data-original-title="Managed network?" style="-webkit-transform: scale(1.4, 1.4); margin-top: 4px;" checked/>
+            </span>
+            <div class="input-group-btn">
+              <!--<input type="submit" value="Add to network" class="btn btn-success"/>-->
+              <a href="#" id="vm-create-network-add-button" class="btn btn-success"><i class="icon-plus-sign"></i></a>
+            </div>
+          </div>
+        </h3>
+      </div>
+    </div>
+  </div>
+</div>
+</form>

circle/dashboard/templates/dashboard/vm-detail-resources.html

 <p class="row">
     <div class="col-sm-3">
-        <label for="cpu-priority-slider"><i class="icon-trophy"></i> CPU priority</label>
+        <label for="vm-cpu-priority-slider"><i class="icon-trophy"></i> CPU priority</label>
     </div>
     <div class="col-sm-9">
-      <input type="text" data-slider="true" data-slider-highlight="true" 
-      data-slider-snap="true" data-slider-range="0,100" data-slider-step="1" id="cpu-priority-slider" value="{{ instance.priority }}">
+      <input name="cpu-priority" type="text" id="vm-cpu-priority-slider" class="vm-slider" value="{{ instance.priority }}" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="{{ instance.priority }}" data-slider-orientation="horizontal" data-slider-handle="square" data-slider-tooltip="hide"/>         
     </div>
 </p>
 
@@ -14,7 +13,7 @@
         <label for="cpu-count-slider"><i class="icon-cogs"></i> CPU count</label>
     </div>
     <div class="col-sm-9">
-      <input type="text" value="{{ instance.num_cores }}" data-slider="true" data-slider-highlight="true" data-slider-range="0,8" data-slider-snap="true" data-slider-step="1" id="cpu-count-slider">
+      <input name="cpu-count" type="text" id="vm-cpu-count-slider" class="vm-slider" value=" {{ instance.num_cores }}" data-slider-min="0" data-slider-max="8" data-slider-step="1" data-slider-value="{{ instance.num_cores }}" data-slider-orientation="horizontal" data-slider-handle="square" data-slider-tooltip="hide"/>         
     </div>
 </p>
 
@@ -24,7 +23,12 @@
         <label for="ram-slider"><i class="icon-ticket"></i> RAM amount</label>
     </div>
     <div class="col-sm-9"> 
-      <input type="text" data-slider="true" data-slider-highlight="true" id="ram-slider" data-slider-range="128,4096" data-slider-snap="true" data-slider-step="128" value="{{ instance.ram_size }}"> MiB
+      <input name="ram-size" type="text" id="vm-ram-size-slider" class="vm-slider" value="{{ instance.ram_size }}" data-slider-min="128" data-slider-max="4096" data-slider-step="128" data-slider-value="{{ instance.ram_size }}" data-slider-orientation="horizontal" data-slider-handle="square" data-slider-tooltip="hide"/>         MiB  
   </div>
 </p>
 
+{% block extra_js %}
+  <style>
+    label {padding-top: 6px;}
+  </style>
+{% endblock %}

circle/dashboard/templates/dashboard/vm-detail.html

@@ -39,8 +39,8 @@
             <a href="#resources" data-toggle="pill" class="text-center">
               <i class="icon-tasks icon-2x"></i><br>
               {% trans "Resources" %}</a></li>
-          <li>
-            <a href="#console" data-toggle="pill" class="text-center">
+            <li {% if instance.state != "RUNNING" %}class="disabled"{% endif %}>
+            <a href="#{% if instance.state == "RUNNING" %}console" data-toggle="pill{% endif %}" class="text-center">
               <i class="icon-desktop icon-2x"></i><br>
               {% trans "Console" %}</a></li>
           <li>

circle/dashboard/templates/dashboard/vm-list.html

@@ -28,47 +28,12 @@
         </p>
       </div>
       <div class="panel-body">
-        <table class="table table-bordered table-striped table-hover vm-list-table">
-          <thead>
-            <tr>
-              <!--<td style="width: 10px;"><input type="checkbox" id="check_all"/></td> -->
-              <td style="width: 10px;">Id</td>
-              <td>Name</td>
-              <td>State</td>
-              <td>Suspend in</td>
-              <td>Delete in</td>
-              <td style="width: 130px;">Admin</td>
-              <td style="width: 10px;">Details</td>
-              <td style="width: 10px;">Actions</td>
-            </tr>
-          </thead>
-          <tbody>
-            {% for i in "xxxxxxxxxxxxxxxxxxxxx" %}
-            {% with forloop.counter as c %}
-                {% include "dashboard/vm-list/test-one.html" %}
-              {% endwith %}
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="no-margin"><i class="icon-desktop"></i> Your virtual machines</h3>
-      </div>
-      <div class="panel-body">
         {% render_table table %}
       </div>
     </div>
   </div>
 </div>
 
-
 <style>
   .popover {
     max-width: 600px;
@@ -97,6 +62,7 @@
 {% endblock %}
 
 {% block extra_js %}
+<script>
 $(function() {
     var ctrlDown, shiftDown = false;
     var ctrlKey = 17;
@@ -203,4 +169,5 @@ $(function() {
     }
 
   }
+</script>
 {% endblock %}

circle/dashboard/urls.py

 from django.conf.urls import patterns, url
 
 from vm.models import Instance
-
-from .views import IndexView, VmDetailView, VmList, AclUpdateView
+from .views import (
+    IndexView, VmDetailView, VmList, VmCreate, TemplateDetail, AclUpdateView
+)
 
 urlpatterns = patterns(
     '',
     url(r'^$', IndexView.as_view()),
+    url(r'^template/(?P<pk>\d+)/$', TemplateDetail.as_view(),
+        name='dashboard.views.template-detail'),
     url(r'^vm/(?P<pk>\d+)/$', VmDetailView.as_view(),
         name='dashboard.views.detail'),
     url(r'^vm/(?P<pk>\d+)/acl/$', AclUpdateView.as_view(model=Instance),
         name='dashboard.views.vm-acl'),
     url(r'^vm/list/$', VmList.as_view(), name='dashboard.views.vm-list'),
+    url(r'^vm/create/$', VmCreate.as_view(),
+        name='dashboard.views.vm-create'),
 )

circle/dashboard/views.py

+from os import getenv
+import json
 import re
 
 from django.contrib.auth.models import User, Group
@@ -7,12 +9,14 @@ from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.views.generic import TemplateView, DetailView, View
 from django.views.generic.detail import SingleObjectMixin
+from django.http import HttpResponse
 
 from django_tables2 import SingleTableView
 
-from vm.models import Instance
-
 from .tables import VmListTable
+from vm.models import Instance, InstanceTemplate, InterfaceTemplate
+from firewall.models import Vlan
+from storage.models import Disk
 
 
 class IndexView(TemplateView):
@@ -24,9 +28,18 @@ class IndexView(TemplateView):
         else:
             user = None
 
+        instances = Instance.objects.filter(owner=user)
         context = super(IndexView, self).get_context_data(**kwargs)
         context.update({
-            'instances': Instance.objects.filter(owner=user),
+            'instances': instances[:5],
+            'more_instances': instances.count() - len(instances[:5])
+        })
+
+        context.update({
+            'running_vms': instances.filter(state='RUNNING'),
+            'running_vm_num': instances.filter(state='RUNNING').count(),
+            'stopped_vm_num': instances.exclude(
+                state__in=['RUNNING', 'NOSTATE']).count()
         })
         return context
 
@@ -50,9 +63,10 @@ class VmDetailView(DetailView):
         instance = context['instance']
         if instance.node:
             port = instance.vnc_port
-            host = instance.node.host.ipv4
+            host = str(instance.node.host.ipv4)
             value = signing.dumps({'host': host,
-                                   'port': port}, key='asdasd')
+                                   'port': port},
+                                  key=getenv("PROXY_SECRET", 'asdasd')),
             context.update({
                 'vnc_url': '%s' % value
             })
@@ -84,8 +98,85 @@ class AclUpdateView(View, SingleObjectMixin):
         return redirect(instance)
 
 
+class TemplateDetail(DetailView):
+    model = InstanceTemplate
+
+    def get(self, request, *args, **kwargs):
+        if request.is_ajax():
+            template = InstanceTemplate.objects.get(pk=kwargs['pk'])
+            template = {
+                'num_cores': template.num_cores,
+                'ram_size': template.ram_size,
+                'priority': template.priority,
+                'arch': template.arch,
+                'description': template.description,
+                'system': template.system,
+                'name': template.name,
+                'disks': [{'pk': d.pk, 'name': d.name}
+                          for d in template.disks.all()],
+                'network': [
+                    {'vlan_pk': i.vlan.pk, 'vlan': i.vlan.name,
+                     'managed': i.managed}
+                    for i in InterfaceTemplate.objects.filter(
+                        template=self.get_object()).all()
+                ]
+            }
+            return HttpResponse(json.dumps(template),
+                                content_type="application/json")
+        else:
+            # return super(TemplateDetail, self).get(request, *args, **kwargs)
+            return HttpResponse('soon')
+
+
 class VmList(SingleTableView):
     template_name = "dashboard/vm-list.html"
     model = Instance
     table_class = VmListTable
     table_pagination = False
+
+
+class VmCreate(TemplateView):
+
+    def get_template_names(self):
+        if self.request.is_ajax():
+            return ['dashboard/modal-wrapper.html']
+        else:
+            return ['dashboard/nojs-wrapper.html']
+
+    def get(self, request, *args, **kwargs):
+        context = self.get_context_data(**kwargs)
+        context.update({
+            'template': 'dashboard/vm-create.html',
+            'box_title': 'Create a VM'
+        })
+        return self.render_to_response(context)
+
+    def get_context_data(self, **kwargs):
+        context = super(VmCreate, self).get_context_data(**kwargs)
+        # TODO acl
+        context.update({
+            'templates': InstanceTemplate.objects.all(),
+            'vlans': Vlan.objects.all(),
+            'disks': Disk.objects.exclude(type="qcow2-snap")
+        })
+
+        return context
+
+    def post(self, request, *args, **kwargs):
+        if self.request.user.is_authenticated():
+            user = self.request.user
+        else:
+            user = None
+
+        resp = request.POST.copy()
+        resp['managed-vlans'] = request.POST.getlist('managed-vlans')
+        resp['unmanaged-vlans'] = request.POST.getlist('unmanaged-vlans')
+        resp['disks'] = request.POST.getlist('disks')
+
+        template = InstanceTemplate.objects.get(
+            pk=request.POST.get('template-pk'))
+        inst = Instance.create_from_template(template=template, owner=user)
+        inst.deploy_async()
+
+        # TODO handle response
+        return HttpResponse(json.dumps(resp), content_type="application/json")

circle/firewall/admin.py

@@ -2,7 +2,8 @@
 
 from django.contrib import admin
 from firewall.models import (Rule, Host, Vlan, Group, VlanGroup, Firewall,
-                             Domain, Record, Blacklist)
+                             Domain, Record, Blacklist,
+                             SwitchPort, EthernetDevice)
 from django import contrib
 
 
@@ -105,22 +106,20 @@ class DomainAdmin(admin.ModelAdmin):
 
 
 class RecordAdmin(admin.ModelAdmin):
-    list_display = ('name_', 'type', 'address_', 'ttl', 'host', 'owner')
-
-    @staticmethod
-    def address_(instance):
-        a = instance.get_data()
-        return a['address'] if a else None
-
-    @staticmethod
-    def name_(instance):
-        a = instance.get_data()
-        return a['name'] if a else None
+    list_display = ('name', 'type', 'address', 'ttl', 'host', 'owner')
 
 
 class BlacklistAdmin(admin.ModelAdmin):
     list_display = ('ipv4', 'reason', 'created_at', 'modified_at')
 
+
+class SwitchPortAdmin(admin.ModelAdmin):
+    list_display = ()
+
+
+class EthernetDeviceAdmin(admin.ModelAdmin):
+    list_display = ('name', )
+
 admin.site.register(Host, HostAdmin)
 admin.site.register(Vlan, VlanAdmin)
 admin.site.register(Rule, RuleAdmin)
@@ -130,3 +129,5 @@ admin.site.register(Firewall, FirewallAdmin)
 admin.site.register(Domain, DomainAdmin)
 admin.site.register(Record, RecordAdmin)
 admin.site.register(Blacklist, BlacklistAdmin)
+admin.site.register(SwitchPort)
+admin.site.register(EthernetDevice, EthernetDeviceAdmin)

circle/firewall/fields.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.ipv6 import is_valid_ipv6_address
 from south.modelsinspector import add_introspection_rules
 from django import forms
-from netaddr import IPNetwork, AddrFormatError
+from netaddr import IPAddress, IPNetwork, AddrFormatError, ZEROFILL
 import re
 
 
@@ -42,6 +42,76 @@ class MACAddressField(models.Field):
 add_introspection_rules([], ["firewall\.fields\.MACAddressField"])
 
 
+class IPAddressFormField(forms.Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a valid IP address. %s'),
+    }
+
+    def validate(self, value):
+        try:
+            return IPAddressField.from_str(value, version=self.version)
+        except (AddrFormatError, TypeError), e:
+            raise ValidationError(self.default_error_messages['invalid']
+                                  % unicode(e))
+
+    def __init__(self, *args, **kwargs):
+        self.version = kwargs['version']
+        del kwargs['version']
+        super(IPAddressFormField, self).__init__(*args, **kwargs)
+
+
+class IPAddressField(models.Field):
+    description = _('IP Network object')
+    __metaclass__ = models.SubfieldBase
+
+    def __init__(self, version=4, serialize=True, *args, **kwargs):
+        kwargs['max_length'] = 100
+        self.version = version
+        super(IPAddressField, self).__init__(*args, **kwargs)
+
+    @staticmethod
+    def from_str(value, version):
+        if not value or value == "":
+            return None
+
+        if isinstance(value, IPAddress):
+            return value
+
+        return IPAddress(value.split('/')[0], version=version,
+                         flags=ZEROFILL)
+
+    def get_internal_type(self):
+        return "CharField"
+
+    def to_python(self, value):
+        return IPAddressField.from_str(value, self.version)
+
+    def get_db_prep_value(self, value, connection, prepared=False):
+        if not value or value == "":
+            return None
+
+        if isinstance(value, IPAddress):
+            if self.version == 4:
+                return ('.'.join(["%03d" % x for x in value.words]))
+            else:
+                return (':'.join(["%04X" % x for x in value.words]))
+        return value
+
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return str(self.get_prep_value(value))
+
+    def clean(self, value, model_instance):
+        value = super(IPAddressField, self).clean(value, model_instance)
+        return self.get_prep_value(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': IPAddressFormField}
+        defaults['version'] = self.version
+        defaults.update(kwargs)
+        return super(IPAddressField, self).formfield(**defaults)
+
+
 class IPNetworkFormField(forms.Field):
     default_error_messages = {
         'invalid': _(u'Enter a valid IP network. %s'),
@@ -91,9 +161,11 @@ class IPNetworkField(models.Field):
 
         if isinstance(value, IPNetwork):
             if self.version == 4:
-                return '.'.join(map(lambda x: "%03d" % x, value.ip.words)) + '/%d' % value.prefixlen
+                return ('.'.join(["%03d" % x for x in value.ip.words])
+                        + '/%02d' % value.prefixlen)
             else:
-                return ':'.join(map(lambda x: "%04X" % x, value.ip.words)) + '/%d' % value.prefixlen
+                return (':'.join(["%04X" % x for x in value.ip.words])
+                        + '/%03d' % value.prefixlen)
         return value
 
     def value_to_string(self, obj):
@@ -110,7 +182,7 @@ class IPNetworkField(models.Field):
         defaults.update(kwargs)
         return super(IPNetworkField, self).formfield(**defaults)
 
-add_introspection_rules([], ["^firewall\.fields\.IPNetworkField"])
+add_introspection_rules([], ["^firewall\.fields\.IP(Address|Network)Field"])
 
 
 def val_alfanum(value):

circle/firewall/fw.py

@@ -37,9 +37,9 @@ class Firewall:
             return
 
         if self.proto == 6 and host.ipv6:
-            ipaddr = host.ipv6 + '/112'
+            ipaddr = str(host.ipv6) + '/112'
         else:
-            ipaddr = host.ipv4
+            ipaddr = str(host.ipv4)
 
         dport_sport = self.dportsport(rule)
 
@@ -75,11 +75,11 @@ class Firewall:
         for vlan in rule.foreign_network.vlans.all():
             if rule.direction == '1':  # going TO host
                 self.iptables('-A INPUT -i %s %s %s -g %s' %
-                              (vlan.interface, dport_sport, rule.extra,
+                              (vlan.name, dport_sport, rule.extra,
                                'LOG_ACC' if rule.accept else 'LOG_DROP'))
             else:
                 self.iptables('-A OUTPUT -o %s %s %s -g %s' %
-                              (vlan.interface, dport_sport, rule.extra,
+                              (vlan.name, dport_sport, rule.extra,
                                'LOG_ACC' if rule.accept else 'LOG_DROP'))
 
     def vlan2vlan(self, l_vlan, rule):
@@ -189,7 +189,7 @@ class Firewall:
                 for d_vlan in s_vlan.snat_to.all():
                     self.iptablesnat('-A POSTROUTING -s %s -o %s -j SNAT '
                                      '--to-source %s' %
-                                     (str(s_vlan.network4), d_vlan.interface,
+                                     (str(s_vlan.network4), d_vlan.name,
                                       s_vlan.snat_ip))
 
         self.iptablesnat('COMMIT')
@@ -210,7 +210,7 @@ class Firewall:
             for d_vlan in self.vlans:
                 self.iptables('-N %s_%s' % (s_vlan, d_vlan))
                 self.iptables('-A FORWARD -i %s -o %s -g %s_%s' %
-                              (s_vlan.interface, d_vlan.interface, s_vlan,
+                              (s_vlan.name, d_vlan.name, s_vlan,
                                d_vlan))
 
         # hosts' rules
@@ -320,81 +320,90 @@ def ipv6_to_arpa(ipv6):
 # ^                     PTR
 # C                     CNAME
 # :                     generic
+# 'fqdn:s:ttl           TXT
 
-def dns():
-    vlans = models.Vlan.objects.all()
-    # regex = re.compile(r'^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$')
+def generate_ptr_records():
     DNS = []
 
-    for i_vlan in vlans:
-        # m = regex.search(i_vlan.net4)
-        rev = i_vlan.reverse_domain
-
-        for i_host in i_vlan.host_set.all():
-            ipv4 = (i_host.pub_ipv4 if i_host.pub_ipv4 and
-                    not i_host.shared_ip else i_host.ipv4)
+    for host in models.Host.objects.order_by('vlan').all():
+        rev = host.vlan.reverse_domain
+        ipv4 = str(host.pub_ipv4 if host.pub_ipv4 and
+                   not host.shared_ip else host.ipv4)
         i = ipv4.split('.', 4)
-            reverse = (i_host.reverse if i_host.reverse and
-                       len(i_host.reverse) else i_host.get_fqdn())
+        reverse = (host.reverse if host.reverse and
+                   len(host.reverse) else host.get_fqdn())
 
         # ipv4
-            if i_host.ipv4:
+        if host.ipv4:
             DNS.append("^%s:%s:%s" % (
                 (rev % {'a': int(i[0]), 'b': int(i[1]), 'c': int(i[2]),
                         'd': int(i[3])}),
                 reverse, models.settings['dns_ttl']))
 
         # ipv6
-            if i_host.ipv6:
-                DNS.append("^%s:%s:%s" % (ipv6_to_arpa(i_host.ipv6),
+        if host.ipv6:
+            DNS.append("^%s:%s:%s" % (ipv6_to_arpa(str(host.ipv6)),
                                       reverse, models.settings['dns_ttl']))
+        return DNS
 
-    for domain in models.Domain.objects.all():
-        DNS.append("Z%s:%s:support.ik.bme.hu::::::%s" %
-                   (domain.name, settings['dns_hostname'],
-                    models.settings['dns_ttl']))
+
+def txt_to_octal(txt):
+    return '\\' + '\\'.join(['%03o' % ord(x) for x in txt])
+
+
+def generate_records():
+    DNS = []
 
     for r in models.Record.objects.all():
-        d = r.get_data()
-        if d['type'] == 'A':
-            DNS.append("+%s:%s:%s" % (d['name'], d['address'], d['ttl']))
-        elif d['type'] == 'AAAA':
+        if r.type == 'A':
+            DNS.append("+%s:%s:%s" % (r.fqdn, r.address, r.ttl))
+        elif r.type == 'AAAA':
             DNS.append(":%s:28:%s:%s" %
-                       (d['name'], ipv6_to_octal(d['address']), d['ttl']))
-        elif d['type'] == 'NS':
-            DNS.append("&%s::%s:%s" % (d['name'], d['address'], d['ttl']))
-        elif d['type'] == 'CNAME':
-            DNS.append("C%s:%s:%s" % (d['name'], d['address'], d['ttl']))
-        elif d['type'] == 'MX':
-            mx = d['address'].split(':', 2)
+                       (r.fqdn, ipv6_to_octal(r.address), r.ttl))
+        elif r.type == 'NS':
+            DNS.append("&%s::%s:%s" % (r.fqdn, r.address, r.ttl))
+        elif r.type == 'CNAME':
+            DNS.append("C%s:%s:%s" % (r.fqdn, r.address, r.ttl))
+        elif r.type == 'MX':
+            mx = r.address.split(':', 2)
             DNS.append("@%(fqdn)s::%(mx)s:%(dist)s:%(ttl)s" %
-                       {'fqdn': d['name'], 'mx': mx[1], 'dist': mx[0],
-                        'ttl': d['ttl']})
-        elif d['type'] == 'PTR':
-            DNS.append("^%s:%s:%s" % (d['name'], d['address'], d['ttl']))
+                       {'fqdn': r.fqdn, 'mx': mx[1], 'dist': mx[0],
+                        'ttl': r.ttl})
+        elif r.type == 'PTR':
+            DNS.append("^%s:%s:%s" % (r.fqdn, r.address, r.ttl))
+        elif r.type == 'TXT':
+            DNS.append("'%s:%s:%s" % (r.fqdn,
+                                      txt_to_octal(r.address), r.ttl))
 
     return DNS
 
 
-def prefix_to_mask(prefix):
-    t = [0, 0, 0, 0]
-    for i in range(0, 4):
-        if prefix > i * 8 + 7:
-            t[i] = 255
-        elif i * 8 < prefix and prefix <= (i + 1) * 8:
-            t[i] = 256 - (2 ** ((i + 1) * 8 - prefix))
-    return ".".join([str(i) for i in t])
+def dns():
+    DNS = []
+
+    # host PTR record
+    DNS += generate_ptr_records()
+
+    # domain SOA record
+    for domain in models.Domain.objects.all():
+        DNS.append("Z%s:%s:support.ik.bme.hu::::::%s" %
+                   (domain.name, settings['dns_hostname'],
+                    models.settings['dns_ttl']))
+
+    # records
+    DNS += generate_records()
+
+    return DNS
 
 
 def dhcp():
-    vlans = models.Vlan.objects.all()
     regex = re.compile(r'^([0-9]+)\.([0-9]+)\.[0-9]+\.[0-9]+\s+'
                        r'([0-9]+)\.([0-9]+)\.[0-9]+\.[0-9]+$')
     DHCP = []
 
 # /tools/dhcp3/dhcpd.conf.generated
 
-    for i_vlan in vlans:
+    for i_vlan in models.Vlan.objects.all():
         if(i_vlan.dhcp_pool):
             m = regex.search(i_vlan.dhcp_pool)
             if(m or i_vlan.dhcp_pool == "manual"):
@@ -411,15 +420,15 @@ def dhcp():
       filename \"pxelinux.0\";
       allow bootp; allow booting;
     }''' % {
-                    'net': i_vlan.net4,
-                    'netmask': prefix_to_mask(i_vlan.prefix4),
+                    'net': str(i_vlan.network4.network),
+                    'netmask': str(i_vlan.network4.netmask),
                     'domain': i_vlan.domain,
                     'router': i_vlan.ipv4,
                     'ntp': i_vlan.ipv4,
                     'dnsserver': settings['rdns_ip'],
                     'extra': ("range %s" % i_vlan.dhcp_pool
                               if m else "deny unknown-clients"),
-                    'interface': i_vlan.interface,
+                    'interface': i_vlan.name,
                     'name': i_vlan.name,
                     'tftp': i_vlan.ipv4
                 })
@@ -440,7 +449,25 @@ def dhcp():
 
 def vlan():
     obj = models.Vlan.objects.values('vid', 'name', 'network4', 'network6')
-    return {x['name']: {'tag': x['vid'],
+    retval = {x['name']: {'tag': x['vid'],
+                          'type': 'internal',
+                          'interfaces': [x['name']],
                           'addresses': [str(x['network4']),
                                         str(x['network6'])]}
               for x in obj}
+    for p in models.SwitchPort.objects.all():
+        eth_count = p.ethernet_devices.count()
+        if eth_count > 1:
+            name = 'bond%d' % p.id
+        elif eth_count == 1:
+            name = p.ethernet_devices.get().name
+        else:  # 0
+            continue
+        tag = p.untagged_vlan.vid
+        retval[name] = {'tag': tag}
+        if p.tagged_vlans is not None:
+            trunk = list(p.tagged_vlans.vlans.values_list('vid', flat=True))
+            retval[name]['trunks'] = sorted(trunk)
+        retval[name]['interfaces'] = list(
+            p.ethernet_devices.values_list('name', flat=True))
+    return retval

circle/firewall/migrations/0035_auto__add_switchport__add_ethernetdevice.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'SwitchPort'
+        db.create_table(u'firewall_switchport', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('untagged_vlan', self.gf('django.db.models.fields.related.ForeignKey')(related_name='untagged_ports', to=orm['firewall.Vlan'])),
+            ('tagged_vlans', self.gf('django.db.models.fields.related.ForeignKey')(related_name='tagged_ports', to=orm['firewall.VlanGroup'])),
+            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('modified_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+        ))
+        db.send_create_signal(u'firewall', ['SwitchPort'])
+
+        # Adding model 'EthernetDevice'
+        db.create_table(u'firewall_ethernetdevice', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=20)),
+            ('switch_port', self.gf('django.db.models.fields.related.ForeignKey')(related_name='ethernet_devices', to=orm['firewall.SwitchPort'])),
+            ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('modified_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+        ))
+        db.send_create_signal(u'firewall', ['EthernetDevice'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'SwitchPort'
+        db.delete_table(u'firewall_switchport')
+
+        # Deleting model 'EthernetDevice'
+        db.delete_table(u'firewall_ethernetdevice')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.blacklist': {
+            'Meta': {'object_name': 'Blacklist'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'reason': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snort_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'tempban'", 'max_length': '10'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.ethernetdevice': {
+            'Meta': {'object_name': 'EthernetDevice'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'switch_port': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ethernet_devices'", 'to': u"orm['firewall.SwitchPort']"})
+        },
+        u'firewall.firewall': {
+            'Meta': {'object_name': 'Firewall'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'ipv6': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.record': {
+            'Meta': {'ordering': "('domain', 'name')", 'object_name': 'Record'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        u'firewall.rule': {
+            'Meta': {'ordering': "('direction', 'proto', 'sport', 'dport', 'nat_dport', 'host')", 'object_name': 'Rule'},
+            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'firewall': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Firewall']"}),
+            'foreign_network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ForeignRules'", 'to': u"orm['firewall.VlanGroup']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Host']"}),
+            'hostgroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Vlan']"}),
+            'vlangroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"})
+        },
+        u'firewall.switchport': {
+            'Meta': {'object_name': 'SwitchPort'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'tagged_vlans': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tagged_ports'", 'to': u"orm['firewall.VlanGroup']"}),
+            'untagged_vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'untagged_ports'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'firewall.vlangroup': {
+            'Meta': {'object_name': 'VlanGroup'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vlans': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['firewall']
\ No newline at end of file

circle/firewall/migrations/0036_auto__chg_field_switchport_tagged_vlans.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'SwitchPort.tagged_vlans'
+        db.alter_column(u'firewall_switchport', 'tagged_vlans_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['firewall.VlanGroup']))
+
+    def backwards(self, orm):
+
+        # Changing field 'SwitchPort.tagged_vlans'
+        db.alter_column(u'firewall_switchport', 'tagged_vlans_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['firewall.VlanGroup']))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.blacklist': {
+            'Meta': {'object_name': 'Blacklist'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'reason': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snort_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'tempban'", 'max_length': '10'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.ethernetdevice': {
+            'Meta': {'object_name': 'EthernetDevice'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'switch_port': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ethernet_devices'", 'to': u"orm['firewall.SwitchPort']"})
+        },
+        u'firewall.firewall': {
+            'Meta': {'object_name': 'Firewall'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'ipv6': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.record': {
+            'Meta': {'ordering': "('domain', 'name')", 'object_name': 'Record'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        u'firewall.rule': {
+            'Meta': {'ordering': "('direction', 'proto', 'sport', 'dport', 'nat_dport', 'host')", 'object_name': 'Rule'},
+            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'firewall': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Firewall']"}),
+            'foreign_network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ForeignRules'", 'to': u"orm['firewall.VlanGroup']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Host']"}),
+            'hostgroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Vlan']"}),
+            'vlangroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"})
+        },
+        u'firewall.switchport': {
+            'Meta': {'object_name': 'SwitchPort'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'tagged_vlans': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tagged_ports'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"}),
+            'untagged_vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'untagged_ports'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'firewall.vlangroup': {
+            'Meta': {'object_name': 'VlanGroup'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vlans': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['firewall']
\ No newline at end of file

circle/firewall/migrations/0037_auto__chg_field_host_pub_ipv4__chg_field_host_ipv6__chg_field_host_ipv.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Host.pub_ipv4'
+        db.alter_column(u'firewall_host', 'pub_ipv4', self.gf('firewall.fields.IPAddressField')(max_length=100, null=True))
+
+        # Changing field 'Host.ipv6'
+        db.alter_column(u'firewall_host', 'ipv6', self.gf('firewall.fields.IPAddressField')(max_length=100, unique=True, null=True))
+
+        # Changing field 'Host.ipv4'
+        db.alter_column(u'firewall_host', 'ipv4', self.gf('firewall.fields.IPAddressField')(unique=True, max_length=100))
+
+        # Changing field 'Vlan.network4'
+        db.alter_column(u'firewall_vlan', 'network4', self.gf('firewall.fields.IPNetworkField')(default='192.168.0.1/24', max_length=100))
+
+        # Changing field 'Record.address'
+        db.alter_column(u'firewall_record', 'address', self.gf('django.db.models.fields.CharField')(default='127.0.0.1', max_length=40))
+
+    def backwards(self, orm):
+
+        # Changing field 'Host.pub_ipv4'
+        db.alter_column(u'firewall_host', 'pub_ipv4', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True))
+
+        # Changing field 'Host.ipv6'
+        db.alter_column(u'firewall_host', 'ipv6', self.gf('django.db.models.fields.GenericIPAddressField')(unique=True, max_length=39, null=True))
+
+        # Changing field 'Host.ipv4'
+        db.alter_column(u'firewall_host', 'ipv4', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, unique=True))
+
+        # Changing field 'Vlan.network4'
+        db.alter_column(u'firewall_vlan', 'network4', self.gf('firewall.fields.IPNetworkField')(max_length=100, null=True))
+
+        # Changing field 'Record.address'
+        db.alter_column(u'firewall_record', 'address', self.gf('django.db.models.fields.CharField')(max_length=40, null=True))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.blacklist': {
+            'Meta': {'object_name': 'Blacklist'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'reason': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snort_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'tempban'", 'max_length': '10'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.ethernetdevice': {
+            'Meta': {'object_name': 'EthernetDevice'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'switch_port': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ethernet_devices'", 'to': u"orm['firewall.SwitchPort']"})
+        },
+        u'firewall.firewall': {
+            'Meta': {'object_name': 'Firewall'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.record': {
+            'Meta': {'ordering': "('domain', 'name')", 'object_name': 'Record'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        u'firewall.rule': {
+            'Meta': {'ordering': "('direction', 'proto', 'sport', 'dport', 'nat_dport', 'host')", 'object_name': 'Rule'},
+            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'firewall': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Firewall']"}),
+            'foreign_network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ForeignRules'", 'to': u"orm['firewall.VlanGroup']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Host']"}),
+            'hostgroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Vlan']"}),
+            'vlangroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"})
+        },
+        u'firewall.switchport': {
+            'Meta': {'object_name': 'SwitchPort'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'tagged_vlans': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tagged_ports'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"}),
+            'untagged_vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'untagged_ports'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'firewall.vlangroup': {
+            'Meta': {'object_name': 'VlanGroup'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vlans': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['firewall']
\ No newline at end of file

circle/firewall/migrations/0038_auto__chg_field_record_address.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Record.address'
+        db.alter_column(u'firewall_record', 'address', self.gf('django.db.models.fields.CharField')(max_length=200))
+
+    def backwards(self, orm):
+
+        # Changing field 'Record.address'
+        db.alter_column(u'firewall_record', 'address', self.gf('django.db.models.fields.CharField')(max_length=40))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.blacklist': {
+            'Meta': {'object_name': 'Blacklist'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'reason': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snort_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'tempban'", 'max_length': '10'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.ethernetdevice': {
+            'Meta': {'object_name': 'EthernetDevice'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'switch_port': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ethernet_devices'", 'to': u"orm['firewall.SwitchPort']"})
+        },
+        u'firewall.firewall': {
+            'Meta': {'object_name': 'Firewall'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.record': {
+            'Meta': {'ordering': "('domain', 'name')", 'object_name': 'Record'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        u'firewall.rule': {
+            'Meta': {'ordering': "('direction', 'proto', 'sport', 'dport', 'nat_dport', 'host')", 'object_name': 'Rule'},
+            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'firewall': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Firewall']"}),
+            'foreign_network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ForeignRules'", 'to': u"orm['firewall.VlanGroup']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Host']"}),
+            'hostgroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Vlan']"}),
+            'vlangroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"})
+        },
+        u'firewall.switchport': {
+            'Meta': {'object_name': 'SwitchPort'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'tagged_vlans': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tagged_ports'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"}),
+            'untagged_vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'untagged_ports'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'firewall.vlangroup': {
+            'Meta': {'object_name': 'VlanGroup'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vlans': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['firewall']
\ No newline at end of file

circle/firewall/migrations/0039_auto__del_field_vlan_interface.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Vlan.interface'
+        db.delete_column(u'firewall_vlan', 'interface')
+
+
+    def backwards(self, orm):
+        # Adding field 'Vlan.interface'
+        db.add_column(u'firewall_vlan', 'interface',
+                      self.gf('django.db.models.fields.CharField')(default=None, max_length=20, unique=True),
+                      keep_default=False)
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.blacklist': {
+            'Meta': {'object_name': 'Blacklist'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'reason': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snort_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'tempban'", 'max_length': '10'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.ethernetdevice': {
+            'Meta': {'object_name': 'EthernetDevice'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'switch_port': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ethernet_devices'", 'to': u"orm['firewall.SwitchPort']"})
+        },
+        u'firewall.firewall': {
+            'Meta': {'object_name': 'Firewall'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.record': {
+            'Meta': {'ordering': "('domain', 'name')", 'object_name': 'Record'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
+        u'firewall.rule': {
+            'Meta': {'ordering': "('direction', 'proto', 'sport', 'dport', 'nat_dport', 'host')", 'object_name': 'Rule'},
+            'accept': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'direction': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'firewall': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Firewall']"}),
+            'foreign_network': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ForeignRules'", 'to': u"orm['firewall.VlanGroup']"}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Host']"}),
+            'hostgroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'nat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nat_dport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'proto': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'sport': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.Vlan']"}),
+            'vlangroup': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'rules'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"})
+        },
+        u'firewall.switchport': {
+            'Meta': {'object_name': 'SwitchPort'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'tagged_vlans': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tagged_ports'", 'null': 'True', 'to': u"orm['firewall.VlanGroup']"}),
+            'untagged_vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'untagged_ports'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'firewall.vlangroup': {
+            'Meta': {'object_name': 'VlanGroup'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'vlans': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['firewall']
\ No newline at end of file

circle/firewall/models.py

@@ -6,10 +6,10 @@ from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from firewall.fields import (MACAddressField, val_alfanum, val_reverse_domain,
                              val_domain, val_ipv4, val_ipv6, val_mx,
-                             ipv4_2_ipv6, IPNetworkField)
+                             ipv4_2_ipv6, IPNetworkField, IPAddressField)
 from django.core.validators import MinValueValidator, MaxValueValidator
 import django.conf
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, post_delete
 import random
 
 from firewall.tasks.local_tasks import reloadtask
@@ -175,15 +175,8 @@ class Vlan(models.Model):
                             verbose_name=_('Name'),
                             help_text=_('The short name of the subnet.'),
                             validators=[val_alfanum])
-    interface = models.CharField(max_length=20, unique=True,
-                                 verbose_name=_('interface'), help_text=_(
-                                     'The name of network interface the '
-                                     'gateway should serve this network on. '
-                                     'For example vlan0004 or eth2.'))
     network4 = IPNetworkField(unique=False,
                               version=4,
-                              null=True,
-                              blank=True,
                               verbose_name=_('IPv4 address/prefix'),
                               help_text=_(
                                   'The IPv4 address and the prefix length '
@@ -374,23 +367,20 @@ class Host(models.Model):
                           help_text=_('The MAC (Ethernet) address of the '
                                       'network interface. For example: '
                                       '99:AA:BB:CC:DD:EE.'))
-    ipv4 = models.GenericIPAddressField(protocol='ipv4', unique=True,
+    ipv4 = IPAddressField(version=4, unique=True,
                           verbose_name=_('IPv4 address'),
-                                        help_text=_(
-                                            'The real IPv4 address of the '
+                          help_text=_('The real IPv4 address of the '
                                       'host, for example 10.5.1.34.'))
-    pub_ipv4 = models.GenericIPAddressField(
-        protocol='ipv4', blank=True, null=True,
+    pub_ipv4 = IPAddressField(
+        version=4, blank=True, null=True,
         verbose_name=_('WAN IPv4 address'),
         help_text=_('The public IPv4 address of the host on the wide '
                     'area network, if different.'))
-    ipv6 = models.GenericIPAddressField(protocol='ipv6', unique=True,
+    ipv6 = IPAddressField(version=6, unique=True,
                           blank=True, null=True,
                           verbose_name=_('IPv6 address'),
-                                        help_text=_(
-                                            'The global IPv6 address of the '
-                                            'host, for example '
-                                            '2001:500:88:200::10.'))
+                          help_text=_('The global IPv6 address of the host'
+                                      ', for example 2001:db:88:200::10.'))
     shared_ip = models.BooleanField(default=False, verbose_name=_('shared IP'),
                                     help_text=_(
                                         'If the given WAN IPv4 address is '
@@ -429,10 +419,7 @@ class Host(models.Model):
     def outgoing_rules(self):
         return self.rules.filter(direction='0')
 
-    def save(self, *args, **kwargs):
-        id = self.id
-        if not self.id and self.ipv6 == "auto":
-            self.ipv6 = ipv4_2_ipv6(self.ipv4)
+    def clean(self):
         if (not self.shared_ip and self.pub_ipv4 and Host.objects.
                 exclude(id=self.id).filter(pub_ipv4=self.pub_ipv4)):
             raise ValidationError(_("If shared_ip has been checked, "
@@ -440,14 +427,46 @@ class Host(models.Model):
         if Host.objects.exclude(id=self.id).filter(pub_ipv4=self.ipv4):
             raise ValidationError(_("You can't use another host's NAT'd "
                                     "address as your own IPv4."))
+
+    def save(self, *args, **kwargs):
+        if not self.id and self.ipv6 == "auto":
+            self.ipv6 = ipv4_2_ipv6(self.ipv4)
         self.full_clean()
+
         super(Host, self).save(*args, **kwargs)
-        if not id:
-            Record(domain=self.vlan.domain, host=self, type='A',
-                   owner=self.owner).save()
+
+        if self.ipv4 is not None:
+            Record.objects.filter(host=self, name=self.hostname,
+                                  type='A').update(address=self.ipv4)
+            record_count = self.record_set.filter(host=self,
+                                                  name=self.hostname,
+                                                  address=self.ipv4,
+                                                  type='A').count()
+            if record_count == 0:
+                Record(host=self,
+                       name=self.hostname,
+                       domain=self.vlan.domain,
+                       address=self.ipv4,
+                       owner=self.owner,
+                       description='host.save()',
+                       type='A').save()
+
         if self.ipv6:
-                Record(domain=self.vlan.domain, host=self, type='AAAA',
-                       owner=self.owner).save()
+            Record.objects.filter(host=self, name=self.hostname,
+                                  type='AAAA').update(address=self.ipv6)
+            record_count = self.record_set.filter(host=self,
+                                                  name=self.hostname,
+                                                  address=self.ipv6,
+                                                  type='AAAA').count()
+            print record_count
+            if record_count == 0:
+                Record(host=self,
+                       name=self.hostname,
+                       domain=self.vlan.domain,
+                       address=self.ipv6,
+                       owner=self.owner,
+                       description='host.save()',
+                       type='AAAA').save()
 
     def enable_net(self):
         self.groups.add(Group.objects.get(name="netezhet"))
@@ -492,6 +511,7 @@ class Host(models.Model):
             else:
                 raise ValidationError(
                     _("All %s ports are already in use.") % proto)
+        return public
 
     def add_port(self, proto, public=None, private=None):
         """
@@ -546,9 +566,9 @@ class Host(models.Model):
             self.rules.filter(owner=self.owner, proto=proto, host=self,
                               dport=private).delete()
 
-    def get_hostname(self, proto):
+    def get_hostname(self, proto, public=True):
         """
-        Get a hostname for public ip address.
+        Get a private or public hostname for host.
 
         :param proto: The IP version (ipv4|ipv6).
         :type proto: str.
@@ -556,19 +576,18 @@ class Host(models.Model):
         assert proto in ('ipv6', 'ipv4', )
         try:
             if proto == 'ipv6':
-                res = self.record_set.filter(type='AAAA')
+                res = self.record_set.filter(type='AAAA',
+                                             address=self.ipv6)
             elif proto == 'ipv4':
-                if self.shared_ip:
+                if self.shared_ip and public:
                     res = Record.objects.filter(type='A',
                                                 address=self.pub_ipv4)
                 else:
-                    res = self.record_set.filter(type='A')
-            return unicode(res[0].get_data()['name'])
+                    res = self.record_set.filter(type='A',
+                                                 address=self.ipv4)
+            return unicode(res[0].fqdn)
         except:
-            if self.shared_ip:
-                return self.pub_ipv4
-            else:
-                return self.ipv4
+            return None
 
     def list_ports(self):
         """
@@ -604,7 +623,7 @@ class Host(models.Model):
         """
         Get fully qualified host name of host.
         """
-        return self.hostname + u'.' + unicode(self.vlan.domain)
+        return self.get_hostname('ipv4', public=False)
 
     @models.permalink
     def get_absolute_url(self):
@@ -648,7 +667,7 @@ class Record(models.Model):
                              verbose_name=_('host'))
     type = models.CharField(max_length=6, choices=CHOICES_type,
                             verbose_name=_('type'))
-    address = models.CharField(max_length=40, blank=True, null=True,
+    address = models.CharField(max_length=200,
                                verbose_name=_('address'))
     ttl = models.IntegerField(default=600, verbose_name=_('ttl'))
     owner = models.ForeignKey(User, verbose_name=_('owner'))
@@ -662,46 +681,26 @@ class Record(models.Model):
         return self.desc()
 
     def desc(self):
-        a = self.get_data()
-        return (u' '.join([a['name'], a['type'], a['address']])
-                if a else _('(empty)'))
+        return u' '.join([self.fqdn, self.type, self.address])
 
     def save(self, *args, **kwargs):
         self.full_clean()
         super(Record, self).save(*args, **kwargs)
 
-    def _validate_w_host(self):
-        """Validate a record with host set."""
-        assert self.host
-        if self.type in ['A', 'AAAA']:
-            if self.address:
-                raise ValidationError(_("Can't specify address for A "
-                                        "or AAAA records if host is set!"))
-            if self.name:
-                raise ValidationError(_("Can't specify name for A "
-                                        "or AAAA records if host is set!"))
-        elif self.type == 'CNAME':
-            if not self.name:
-                raise ValidationError(_("Name must be specified for "
-                                        "CNAME records if host is set!"))
-            if self.address:
-                raise ValidationError(_("Can't specify address for "
-                                        "CNAME records if host is set!"))
-
-    def _validate_wo_host(self):
-        """Validate a record without a host set."""
-        assert self.host is None
-
+    def _validate_record(self):
+        """Validate a record."""
         if not self.address:
             raise ValidationError(_("Address must be specified!"))
         if self.type == 'A':
             val_ipv4(self.address)
         elif self.type == 'AAAA':
             val_ipv6(self.address)
-        elif self.type in ['CNAME', 'NS', 'PTR', 'TXT']:
+        elif self.type in ['CNAME', 'NS', 'PTR']:
             val_domain(self.address)
         elif self.type == 'MX':
             val_mx(self.address)
+        elif self.type == 'TXT':
+            pass
         else:
             raise ValidationError(_("Unknown record type."))
 
@@ -711,51 +710,14 @@ class Record(models.Model):
         if self.name:
             self.name = self.name.rstrip(".")    # remove trailing dots
 
-        if self.host:
-            self._validate_w_host()
-        else:
-            self._validate_wo_host()
+        self._validate_record()
 
     @property
     def fqdn(self):
-        if self.host and self.type != 'MX':
-            if self.type in ['A', 'AAAA']:
-                return self.host.get_fqdn()
-            elif self.type == 'CNAME':
-                return self.name + '.' + unicode(self.domain)
-            else:
-                return self.name
-        else:    # if self.host is None
         if self.name:
-                return self.name + '.' + unicode(self.domain)
-            else:
-                return unicode(self.domain)
-
-    def __get_address(self):
-        if self.host:
-            if self.type == 'A':
-                return (self.host.pub_ipv4
-                        if self.host.pub_ipv4 and not self.host.shared_ip
-                        else self.host.ipv4)
-            elif self.type == 'AAAA':
-                return self.host.ipv6
-            elif self.type == 'CNAME':
-                return self.host.get_fqdn()
-        # otherwise:
-        return self.address
-
-    def get_data(self):
-        name = self.fqdn
-        address = self.__get_address()
-        if self.host and self.type == 'AAAA' and not self.host.ipv6:
-            return None
-        elif not address or not name:
-            return None
+            return '%s.%s' % (self.name, self.domain.name)
         else:
-            return {'name': name,
-                    'type': self.type,
-                    'ttl': self.ttl,
-                    'address': address}
+            return self.domain.name
 
     @models.permalink
     def get_absolute_url(self):
@@ -768,6 +730,51 @@ class Record(models.Model):
         )
 
 
+class SwitchPort(models.Model):
+    untagged_vlan = models.ForeignKey('Vlan',
+                                      related_name='untagged_ports',
+                                      verbose_name=_('untagged vlan'))
+    tagged_vlans = models.ForeignKey('VlanGroup', blank=True, null=True,
+                                     related_name='tagged_ports',
+                                     verbose_name=_('tagged vlans'))
+    description = models.TextField(blank=True, verbose_name=_('description'))
+    created_at = models.DateTimeField(auto_now_add=True,
+                                      verbose_name=_('created_at'))
+    modified_at = models.DateTimeField(auto_now=True,
+                                       verbose_name=_('modified_at'))
+
+    def __unicode__(self):
+        devices = ','.join(self.ethernet_devices.values_list('name',
+                                                             flat=True))
+        tagged_vlans = self.tagged_vlans.name if self.tagged_vlans else ''
+        return 'devices=%s untagged=%s tagged=%s' % (devices,
+                                                     self.untagged_vlan,
+                                                     tagged_vlans)
+
+    @models.permalink
+    def get_absolute_url(self):
+        return ('network.switch_port', None, {'pk': self.pk})
+
+
+class EthernetDevice(models.Model):
+    name = models.CharField(max_length=20,
+                            unique=True,
+                            verbose_name=_('interface'),
+                            help_text=_('The name of network interface the '
+                                        'gateway should serve this network '
+                                        'on. For example eth2.'))
+    switch_port = models.ForeignKey('SwitchPort',
+                                    related_name='ethernet_devices',
+                                    verbose_name=_('switch port'))
+    created_at = models.DateTimeField(auto_now_add=True,
+                                      verbose_name=_('created_at'))
+    modified_at = models.DateTimeField(auto_now=True,
+                                       verbose_name=_('modified_at'))
+
+    def __unicode__(self):
+        return self.name
+
+
 class Blacklist(models.Model):
     CHOICES_type = (('permban', 'permanent ban'), ('tempban', 'temporary ban'),
                     ('whitelist', 'whitelist'), ('tempwhite', 'tempwhite'))
@@ -800,16 +807,11 @@ class Blacklist(models.Model):
         return ('network.blacklist', None, {'pk': self.pk})
 
 
-def send_task(sender, instance, created, **kwargs):
+def send_task(sender, instance, created=False, **kwargs):
     reloadtask.apply_async(args=[sender.__name__])
 
 
-post_save.connect(send_task, sender=Host)
-post_save.connect(send_task, sender=Rule)
-post_save.connect(send_task, sender=Domain)
-post_save.connect(send_task, sender=Record)
-post_save.connect(send_task, sender=Vlan)
-post_save.connect(send_task, sender=Firewall)
-post_save.connect(send_task, sender=Group)
-post_save.connect(send_task, sender=Host)
-post_save.connect(send_task, sender=Blacklist)
+for sender in [Host, Rule, Domain, Record, Vlan, Firewall, Group, Blacklist,
+               SwitchPort, EthernetDevice]:
+    post_save.connect(send_task, sender=sender)
+    post_delete.connect(send_task, sender=sender)

circle/firewall/tasks/local_tasks.py

@@ -47,16 +47,16 @@ def reloadtask(type='Host'):
         if type in ["Host", "Record", "Domain", "Vlan"]:
             cache.add("dns_lock", "true", 30)
 
-        if type == "Host":
+        if type in ["Host", "Vlan"]:
             cache.add("dhcp_lock", "true", 30)
 
-        if type in ["Host", "Rule", "Firewall"]:
+        if type in ["Host", "Rule", "Firewall", "Vlan"]:
             cache.add("firewall_lock", "true", 30)
 
         if type == "Blacklist":
             cache.add("blacklist_lock", "true", 30)
 
-        if type == "Vlan":
+        if type in ["Vlan", "SwitchPort", "EthernetDevice"]:
             cache.add("firewall_vlan_lock", "true", 30)
 
         print type

circle/monitor/calvin/examples/basic.py

+from calvin import *
+
+server_name = "0.0.0.0"
+server_port = "8080"
+
+query = Query()
+query.setTarget("1889.foo.fook.fookie.com.DOMAIN")
+query.setMetric("cpu.usage")
+query.setFormat("json") # Not neccesary, default is json
+query.setRelativeStart(1, "minutes") # Current cpu usage
+
+query.generate()
+# print(query.getGenerated())
+
+print(query.getStart())
+# query.setAbsoluteStart("1889", "04", "20", "00", "00")
+# query.setRelativeEnd(...)
+# query.setAbsoluteEnd(...)
+
+handler = GraphiteHandler(server_name, server_port)
+
+handler.put(query)
+handler.send()
+response = handler.pop()
+
+print(response["target"])
+print(response["datapoints"])
+
+

circle/monitor/calvin/examples/test.py

+from calvin import *
+import datetime
+
+query = Query()
+query.setTarget("2008.vm.ik.bme.hu.circle")
+query.setMetric("cpu.usage")
+query.setAbsoluteStart("2013", "10", "23", "00", "00")
+query.generate()
+
+handler  = GraphiteHandler("10.9.1.209")
+
+times = int(input("How many requests do you intend to send? [postive integer]  "))
+
+global_start = datetime.datetime.now()
+for i in range (1,times):
+    local_start = datetime.datetime.now()
+    handler.put(query)
+    handler.send()
+    local_end = datetime.datetime.now()
+    print((local_end-local_start).microseconds)
+global_end = datetime.datetime.now()
+
+print("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*")
+print("Summary:")
+print(global_end - global_start)
+print("AVG:")
+print((global_end -global_start) / times)
+print("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*")

circle/monitor/calvin/src/calvin.py

+import json, requests
+
+class GraphiteHandler:
+
+    def __init__(self, server_name = "localhost", server_port = "8080"):
+        self.__server_name = server_name
+        self.__server_port = server_port
+        self.__queries = []
+        self.__responses = []
+
+    def put(self, query):
+        self.__queries.append(query)
+
+    def cleanUpQueries(self):
+        self.__queries = []
+
+    def cleanUpResponses(self):
+        self.__responses = []
+
+    def isEmpty(self):
+        return len(self.__queries) is 0
+
+    def generateAll(self):
+        """
+        Regenerate the queries before sending.
+        """
+        for query in self.__queries:
+            query.generate()
+
+    def send(self):
+        """
+        Generates the corrent query for the Graphite webAPI and flush all the
+        queries in the fifo.
+        Important: After sending queries to the server the fifo will lost its
+        content.
+        """
+        url_base = "http://%s:%s/render?" % (self.__server_name, self.__server_port)
+        for query in self.__queries:
+            response = requests.get(url_base + query.getGenerated())
+            if query.getFormat() is "json":
+                self.__responses.append(response.json()[0]) #DICT
+            else:
+                self.__responses.append(response)
+        self.cleanUpQueries()
+
+    def pop(self):
+        """
+        Pop the first query has got from the server.
+        """
+        try:
+            return self.__responses.pop(0) # Transform to dictionary
+        except:
+            print("There is no more responses.")
+
+class Query:
+
+    def __init__(self):
+        """
+        Query initializaion:
+            default format is json dictionary
+            keys: ("target <string>","datapoints <list>")
+        """
+        self.__target = ""
+        self.__metric = ""
+        self.__start = ""
+        self.__end = ""
+        self.__function = ""
+        self.__response_format = "json"
+        self.__generated = ""
+
+    def setTarget(self, target):
+        """
+        Hostname of the target we should get the information from.
+        After the hostname you should use the domain the target is in.
+        Example: "foo.foodomain.domain.com.DOMAIN" where DOMAIN is
+        the root of the graphite server.
+        """
+        self.__target = '.'.join(target.split('.')[::-1])
+
+    def getTarget(self):
+        return self.__target
+
+    def setMetric(self, metric):
+        self.__metric = metric
+
+    def getMetric(self):
+        return self.__metric
+
+    def setAbsoluteStart(self, year, month, day, hour, minute):
+        """
+        Function for setting the time you want to get the reports from.
+        """
+        if(len(year)>4 or len(year)<2):
+            raise
+        self.__start = hour + ":" + minute + "_" + year + month + day
+
+    def setRelativeStart(self, value, scale):
+        """
+        Function for setting the time you want to get the reports from.
+        """
+        if scale not in ["years", "months", "days", "hours", "minutes", "seconds"]:
+            raise
+        self.__start = "-" + str(value) + scale
+
+    def getStart(self):
+        return self.__start
+
+    def setAbsoluteEnd(self, year, month, day, hour, minute):
+        """
+        Function for setting the time until you want to get the reports from.
+        """
+        if(len(year)>4 or len(year)<2):
+            raise
+        self.__end = hour + ":" + minute + "_" + year + month + day
+
+    def setRelativeEnd(self, value, scale):
+        """
+        Function for setting the time until you want to get the reports from.
+        """
+        if scale not in ["years", "months", "days", "hours", "minutes", "seconds"]:
+            raise
+        self.__end = "-" + str(value) + scale
+
+    def getEnd(self):
+        return self.__end
+
+    def setFormat(self, fmat):
+        """
+        Function for setting the format of the response from the server.
+        Valid values: ["csv", "raw", "json"]
+        """
+        valid_formats = ["csv", "raw", "json"]
+        if fmat not in valid_formats:
+            raise
+        self.__response_format = fmat
+
+    def getFormat(self):
+        return self.__response_format
+
+    def generate(self):
+        """
+        You must always call this function before sending the metric to the
+        server for it generates the valid format that the graphite API can
+        parse.
+        """
+        tmp = "target=" + self.__target + "." + self.__metric
+        if len(self.__start) is not 0:
+            tmp = tmp + "&from=" + self.__start
+        if len(self.__end) is not 0:
+            tmp = tmp + "&until=" + self.__end
+        tmp = tmp + "&format=" + self.__response_format
+        self.__generated = tmp
+        return self.__generated
+
+    def getGenerated(self):
+        """
+        Returns the generated query string.
+        Throws exception if it haven't been done yet.
+        """
+        if len(self.__generated) is 0:
+            raise
+        return self.__generated
+
+

circle/network/forms.py

@@ -6,7 +6,7 @@ from crispy_forms.layout import Layout, Fieldset, Div, Submit, BaseInput
 from crispy_forms.bootstrap import FormActions
 
 from firewall.models import (Host, Vlan, Domain, Group, Record, Blacklist,
-                             Rule, VlanGroup)
+                             Rule, VlanGroup, SwitchPort)
 
 
 class LinkButton(BaseInput):
@@ -188,6 +188,28 @@ class RuleForm(ModelForm):
         model = Rule
 
 
+class SwitchPortForm(ModelForm):
+    helper = FormHelper()
+    helper.layout = Layout(
+        Div(
+            Fieldset(
+                '',
+                'untagged_vlan',
+                'tagged_vlans',
+                'description',
+            )
+        ),
+        FormActions(
+            Submit('submit', 'Save'),
+            LinkButton('back', 'Back',
+                       reverse_lazy('network.switch_port_list'))
+        )
+    )
+
+    class Meta:
+        model = SwitchPort
+
+
 class VlanForm(ModelForm):
     helper = FormHelper()
     helper.layout = Layout(

circle/network/static/js/switch-port.js

+$('i[class="icon-remove"]').click(function() {
+    href = $(this).parent('a').attr('href');
+    csrf = getCookie('csrftoken');
+    var click_this = this;
+
+    group = $(this).closest('h4').text();
+
+    s = gettext('Are you sure you want to delete this device?');
+
+    bootbox.dialog({
+        message: s,
+        buttons: {
+            cancel: {
+                'label': gettext("Cancel"),
+                'className': "btn-info",
+                'callback': function () {}
+            },
+            remove: {
+                'label': gettext("Remove"),
+                'className': "btn-danger",
+                'callback': function() {
+                    delete_device(click_this);
+                }
+            }
+        }
+    });
+    return false;
+});
+
+
+function delete_device(click_this) {
+    ajax = $.ajax({
+        type: 'POST',
+        url: href,
+        headers: {"X-CSRFToken": csrf},
+        context: click_this,
+        success: function(data, textStatus, xhr) {
+            if(xhr.status == 200) {
+                  $(this).closest('tr').fadeOut(500, function() {
+                      $(this).remove();
+                  });
+            }
+        }
+    });
+    return false;
+}

circle/network/tables.py

 from django_tables2 import Table, A
 from django_tables2.columns import LinkColumn, TemplateColumn
 
-from firewall.models import Host, Vlan, Domain, Group, Record, Rule
+from firewall.models import Host, Vlan, Domain, Group, Record, Rule, SwitchPort
 
 
 class BlacklistTable(Table):
@@ -129,6 +129,17 @@ class RuleTable(Table):
         order_by = 'direction'
 
 
+class SwitchPortTable(Table):
+    pk = LinkColumn('network.switch_port', args=[A('pk')],
+                    verbose_name="ID")
+
+    class Meta:
+        model = SwitchPort
+        attrs = {'class': 'table table-striped table-condensed'}
+        fields = ('pk', 'untagged_vlan', 'tagged_vlans', 'description', )
+        order_by = 'pk'
+
+
 class VlanTable(Table):
     name = LinkColumn('network.vlan', args=[A('vid')])
 

circle/network/templates/network/menu.html

@@ -19,6 +19,9 @@
 {% url "network.rule_list" as u %}
 {% trans "Rules" as t %}
 {% include "network/menu-item.html" with href=u text=t %}
+{% url "network.switch_port_list" as u %}
+{% trans "Switch ports" as t %}
+{% include "network/menu-item.html" with href=u text=t %}
 
 <li class="dropdown{% if "groups" in request.path %} active{% endif %}">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Groups <b class="caret"></b></a>

circle/network/templates/network/switch-port-create.html

+{% extends "network/base.html" %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+{% load l10n %}
+{% load staticfiles %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+<div class="page-header">
+    <h2>{% trans "Create a new switch port" %}</h2>
+</div>
+
+<div class="row">
+    <div class="col-sm-8">
+        {% crispy form %}
+    </div>
+    <div class="col-sm-4">
+        Halp
+    </div>
+</div>
+{% endblock %}

circle/network/templates/network/switch-port-edit.html

+{% extends "network/base.html" %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+{% load l10n %}
+{% load staticfiles %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+<div class="page-header">
+  <a href="{% url "network.switch_port_delete" pk=switch_port_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this switchport" %}</a>
+  <h2>Welp <small>dunno what to write here</small></h2>
+</div>
+<div class="row">
+  <div class="col-sm-5">
+    {% crispy form %}
+  </div>
+  <style>
+    .ethernet-devices-mini-table tr td:last-child {
+      width: 1px;
+    }
+  </style>
+  <div class="col-sm-5 col-sm-offset-1">
+    <h3>{% trans "Ethernet Devices" %}</h3>
+      <hr />
+      {% if devices %}
+        <table class="table table-condensed table-bordered ethernet-devices-mini-table">
+        {% for i in devices %}
+          <tr>
+            <td>{{ i }}</td>
+            <td>
+              <a href="{% url "network.remove_switch_port_device" pk=switch_port_pk device_pk=i.pk %}"><i class="icon-remove"></i></a> 
+            </td>
+          </tr>
+        {% endfor %}
+        </table>
+      {% else %}
+        {% trans "No ethernet device" %}
+      {% endif %}
+      <hr />
+      <form action="{% url "network.add_switch_port_device" pk=switch_port_pk %}" method="POST">
+        {% csrf_token %}                                                    
+          <div class="input-group">                                       
+            <input type="text" class="form-control" name="device_name" placeholder="{% trans "Name" %}"/>
+              <div class="input-group-btn">                               
+                <input type="submit" value="{% trans "Add new Ethernet Device" %}" class="btn btn-default"></input>
+              </div>                                                      
+            </div><!-- input-group -->                                      
+        </form>                     
+  </div>
+</div>
+{% endblock %}
+
+{% block extra_etc %}
+  <script src="{% static "js/switch-port.js" %}"></script>
+{% endblock %}

circle/network/templates/network/switch-port-list.html

+{% extends "network/base.html" %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+{% load l10n %}
+{% load staticfiles %}
+
+{% block content %}
+<div class="page-header">   
+    <a href="{% url "network.switch_port_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new switch port" %}</a>
+    <h1>{% trans "Switch ports" %} <small></small></h1>
+</div>
+
+<div class="table-responsive">
+    {% render_table table %}
+</div>
+{% endblock %}

circle/network/urls.py

@@ -8,9 +8,12 @@ from .views import (IndexView,
                     BlacklistList, BlacklistDetail, BlacklistDelete,
                     BlacklistCreate,
                     RuleList, RuleDetail, RuleDelete, RuleCreate,
+                    SwitchPortList, SwitchPortDetail, SwitchPortCreate,
+                    SwitchPortDelete,
                     VlanGroupList, VlanGroupDetail, VlanGroupDelete,
                     VlanGroupCreate,
-                    remove_host_group, add_host_group)
+                    remove_host_group, add_host_group,
+                    remove_switch_port_device, add_switch_port_device)
 
 js_info_dict = {
     'packages': ('network', ),
@@ -56,6 +59,14 @@ urlpatterns = patterns(
     url('^rules/create$', RuleCreate.as_view(), name='network.rule_create'),
     url('^rules/(?P<pk>\d+)/$', RuleDetail.as_view(),
         name='network.rule'),
+    url('^switchports/$', SwitchPortList.as_view(),
+        name='network.switch_port_list'),
+    url('^switchports/create$', SwitchPortCreate.as_view(),
+        name='network.switch_port_create'),
+    url('^switchports/(?P<pk>\d+)/$', SwitchPortDetail.as_view(),
+        name='network.switch_port'),
+    url('^switchports/delete/(?P<pk>\d+)/$', SwitchPortDelete.as_view(),
+        name="network.switch_port_delete"),
     url('^vlans/$', VlanList.as_view(), name='network.vlan_list'),
     url('^vlans/create$', VlanCreate.as_view(), name='network.vlan_create'),
     url('^vlans/(?P<vid>\d+)/$', VlanDetail.as_view(), name='network.vlan'),
@@ -71,10 +82,18 @@ urlpatterns = patterns(
         name="network.vlan_group_delete"),
     url('^rules/delete/(?P<pk>\d+)/$', RuleDelete.as_view(),
         name="network.rule_delete"),
+
+    # non class based views
     url('^hosts/(?P<pk>\d+)/remove/(?P<group_pk>\d+)/$', remove_host_group,
         name='network.remove_host_group'),
     url('^hosts/(?P<pk>\d+)/add/$', add_host_group,
         name='network.add_host_group'),
+    url('^switchports/(?P<pk>\d+)/remove/(?P<device_pk>\d+)/$',
+        remove_switch_port_device, name='network.remove_switch_port_device'),
+    url('^switchports/(?P<pk>\d+)/add/$', add_switch_port_device,
+        name='network.add_switch_port_device'),
+
+    # js gettext catalog
     url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict,
         name="network.js_catalog"),
 )

circle/network/views.py

@@ -7,13 +7,13 @@ from django.http import HttpResponse
 from django_tables2 import SingleTableView
 
 from firewall.models import (Host, Vlan, Domain, Group, Record, Blacklist,
-                             Rule, VlanGroup)
+                             Rule, VlanGroup, SwitchPort, EthernetDevice)
 from .tables import (HostTable, VlanTable, SmallHostTable, DomainTable,
                      GroupTable, RecordTable, BlacklistTable, RuleTable,
                      VlanGroupTable, SmallRuleTable, SmallGroupRuleTable,
-                     SmallRecordTable)
+                     SmallRecordTable, SwitchPortTable)
 from .forms import (HostForm, VlanForm, DomainForm, GroupForm, RecordForm,
-                    BlacklistForm, RuleForm, VlanGroupForm)
+                    BlacklistForm, RuleForm, VlanGroupForm, SwitchPortForm)
 
 from django.contrib import messages
 from django.views.generic.edit import FormMixin
@@ -530,6 +530,50 @@ class RuleDelete(DeleteView):
             return reverse_lazy('network.rule_list')
 
 
+class SwitchPortList(SingleTableView):
+    model = SwitchPort
+    table_class = SwitchPortTable
+    template_name = "network/switch-port-list.html"
+    table_pagination = False
+
+
+class SwitchPortDetail(UpdateView, SuccessMessageMixin):
+    model = SwitchPort
+    template_name = "network/switch-port-edit.html"
+    form_class = SwitchPortForm
+    success_message = _(u'Succesfully modified switch port!')
+
+    def get_success_url(self):
+        if 'pk' in self.kwargs:
+            return reverse_lazy('network.switch_port', kwargs=self.kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super(SwitchPortDetail, self).get_context_data(**kwargs)
+        context['switch_port_pk'] = self.object.pk
+        context['devices'] = EthernetDevice.objects.filter(
+            switch_port=self.object.pk)
+        return context
+
+
+class SwitchPortCreate(CreateView, SuccessMessageMixin):
+    model = SwitchPort
+    template_name = "network/switch-port-create.html"
+    form_class = SwitchPortForm
+    success_message = _(u'Successfully created switch port!')
+
+
+class SwitchPortDelete(DeleteView):
+    model = SwitchPort
+    template_name = "network/confirm/base_delete.html"
+
+    def get_success_url(self):
+        next = self.request.POST.get('next')
+        if next:
+            return next
+        else:
+            return reverse_lazy('network.switch_port_list')
+
+
 class VlanList(SingleTableView):
     model = Vlan
     table_class = VlanTable
@@ -690,3 +734,47 @@ def add_host_group(request, **kwargs):
                                             'group': group
                                         }))
         return redirect(reverse_lazy('network.host', kwargs=kwargs))
+
+
+def remove_switch_port_device(request, **kwargs):
+    device = EthernetDevice.objects.get(pk=kwargs['device_pk'])
+    # for get we show the confirmation page
+    if request.method == "GET":
+        return render(request, 'network/confirm/base_delete.html',
+                      {'object': device})
+
+    # for post we actually remove the group from the host
+    elif request.method == "POST":
+        device.delete()
+        if not request.is_ajax():
+            messages.success(request, _(u"Successfully deleted ethernet device"
+                                        " %(name)s!" % {
+                                            'name': device.name,
+                                        }))
+        return redirect(reverse_lazy('network.switch_port',
+                                     kwargs={'pk': kwargs['pk']}))
+
+
+def add_switch_port_device(request, **kwargs):
+    device_name = request.POST.get('device_name')
+
+    if (request.method == "POST" and device_name and len(device_name) > 0
+       and EthernetDevice.objects.filter(name=device_name).count() == 0):
+
+        switch_port = SwitchPort.objects.get(pk=kwargs['pk'])
+        new_device = EthernetDevice(name=device_name, switch_port=switch_port)
+        new_device.save()
+        if not request.is_ajax():
+            messages.success(request, _(u"Successfully added %(name)s to this"
+                                        " switch port" % {
+                                            'name': device_name,
+                                        }))
+        return redirect(reverse_lazy('network.switch_port', kwargs=kwargs))
+
+    elif not len(device_name) > 0:
+        messages.error(request, _("Ethernet device name cannot be empty!"))
+        return redirect(reverse_lazy('network.switch_port', kwargs=kwargs))
+    elif EthernetDevice.objects.get(name=device_name) is not None:
+        messages.error(request, _("There is already an ethernet device with"
+                                  " that name!"))
+        return redirect(reverse_lazy('network.switch_port', kwargs=kwargs))

circle/storage/migrations/0009_auto__del_field_disk_removed__add_field_disk_destroyed.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Disk.removed'
+        db.delete_column(u'storage_disk', 'removed')
+
+        # Adding field 'Disk.destroyed'
+        db.add_column(u'storage_disk', 'destroyed',
+                      self.gf('django.db.models.fields.DateTimeField')(default=None, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'Disk.removed'
+        db.add_column(u'storage_disk', 'removed',
+                      self.gf('django.db.models.fields.DateTimeField')(default=None, null=True, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'Disk.destroyed'
+        db.delete_column(u'storage_disk', 'destroyed')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'storage.diskactivity': {
+            'Meta': {'object_name': 'DiskActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'disk': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['storage.Disk']"}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '50'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['storage']
\ No newline at end of file

circle/storage/migrations/0010_auto__del_field_diskactivity_state__add_field_diskactivity_parent.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'DiskActivity.state'
+        db.delete_column(u'storage_diskactivity', 'state')
+
+        # Adding field 'DiskActivity.parent'
+        db.add_column(u'storage_diskactivity', 'parent',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['storage.DiskActivity'], null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'DiskActivity.state'
+        db.add_column(u'storage_diskactivity', 'state',
+                      self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=50),
+                      keep_default=False)
+
+        # Deleting field 'DiskActivity.parent'
+        db.delete_column(u'storage_diskactivity', 'parent_id')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'storage.diskactivity': {
+            'Meta': {'object_name': 'DiskActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'disk': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['storage.Disk']"}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DiskActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['storage']
\ No newline at end of file

circle/storage/models.py

 # coding=utf-8
 
+from contextlib import contextmanager
 import logging
 import uuid
 
-from django.contrib.auth.models import User
 from django.db.models import (Model, BooleanField, CharField, DateTimeField,
-                              ForeignKey, TextField)
+                              ForeignKey)
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from model_utils.models import TimeStampedModel
 from sizefield.models import FileSizeField
 
 from .tasks import local_tasks, remote_tasks
+from common.models import ActivityModel, activitycontextimpl
 
 logger = logging.getLogger(__name__)
 
@@ -51,7 +52,7 @@ class Disk(TimeStampedModel):
     ready = BooleanField(default=False)
     dev_num = CharField(default='a', max_length=1,
                         verbose_name=_("device number"))
-    removed = DateTimeField(blank=True, default=None, null=True)
+    destroyed = DateTimeField(blank=True, default=None, null=True)
 
     class Meta:
         ordering = ['name']
@@ -84,7 +85,7 @@ class Disk(TimeStampedModel):
         return {
             'qcow2-norm': 'qcow2',
             'qcow2-snap': 'qcow2',
-            'iso': 'iso',
+            'iso': 'raw',
             'raw-ro': 'raw',
             'raw-rw': 'raw',
         }[self.type]
@@ -92,10 +93,12 @@ class Disk(TimeStampedModel):
     @property
     def device_type(self):
         return {
-            'qcow2': 'vd',
-            'raw': 'vd',
+            'qcow2-norm': 'vd',
+            'qcow2-snap': 'vd',
             'iso': 'hd',
-        }[self.format]
+            'raw-ro': 'vd',
+            'raw-rw': 'vd',
+        }[self.type]
 
     def is_in_use(self):
         return self.instance_set.exclude(state='SHUTOFF').exists()
@@ -126,7 +129,8 @@ class Disk(TimeStampedModel):
             'source': self.path,
             'driver_type': self.format,
             'driver_cache': 'default',
-            'target_device': self.device_type + self.dev_num
+            'target_device': self.device_type + self.dev_num,
+            'disk_device': 'cdrom' if self.type == 'iso' else 'disk'
         }
 
     def get_disk_desc(self):
@@ -160,30 +164,24 @@ class Disk(TimeStampedModel):
         if self.ready:
             return False
 
-        act = DiskActivity(activity_code='storage.Disk.deploy')
-        act.disk = self
-        act.started = timezone.now()
-        act.state = 'PENDING'
-        act.task_uuid = task_uuid
-        act.user = user
-        act.save()
+        with disk_activity(code_suffix='deploy', disk=self,
+                           task_uuid=task_uuid, user=user) as act:
 
             # Delegate create / snapshot jobs
             queue_name = self.datastore.hostname + ".storage"
             disk_desc = self.get_disk_desc()
             if self.type == 'qcow2-snap':
-            act.update_state('CREATING SNAPSHOT')
+                with act.sub_activity('creating_snapshot'):
                     remote_tasks.snapshot.apply_async(args=[disk_desc],
                                                       queue=queue_name).get()
             else:
-            act.update_state('CREATING DISK')
+                with act.sub_activity('creating_disk'):
                     remote_tasks.create.apply_async(args=[disk_desc],
                                                     queue=queue_name).get()
 
             self.ready = True
             self.save()
 
-        act.finish('SUCCESS')
             return True
 
     def deploy_async(self, user=None):
@@ -192,17 +190,17 @@ class Disk(TimeStampedModel):
         local_tasks.deploy.apply_async(args=[self, user],
                                        queue="localhost.man")
 
-    def remove(self, user=None, task_uuid=None):
+    def destroy(self, user=None, task_uuid=None):
         # TODO add activity logging
-        self.removed = timezone.now()
+        self.destroyed = timezone.now()
         self.save()
 
-    def remove_async(self, user=None):
-        local_tasks.remove.apply_async(args=[self, user],
+    def destroy_async(self, user=None):
+        local_tasks.destroy.apply_async(args=[self, user],
                                         queue='localhost.man')
 
     def restore(self, user=None, task_uuid=None):
-        """Restore removed disk.
+        """Restore destroyed disk.
         """
         # TODO
         pass
@@ -211,7 +209,7 @@ class Disk(TimeStampedModel):
         local_tasks.restore.apply_async(args=[self, user],
                                         queue='localhost.man')
 
-    def save_as(self, name, user=None, task_uuid=None):
+    def save_as(self, user=None, task_uuid=None):
         mapping = {
             'qcow2-snap': ('qcow2-norm', self.base),
         }
@@ -224,19 +222,14 @@ class Disk(TimeStampedModel):
         # from this point on, the caller has to guarantee that the disk is not
         # going to be used until the operation is complete
 
-        act = DiskActivity(activity_code='storage.Disk.save_as')
-        act.disk = self
-        act.started = timezone.now()
-        act.state = 'PENDING'
-        act.task_uuid = task_uuid
-        act.user = user
-        act.save()
+        with disk_activity(code_suffix='save_as', disk=self,
+                           task_uuid=task_uuid, user=user):
 
             filename = str(uuid.uuid4())
             new_type, new_base = mapping[self.type]
 
             disk = Disk.objects.create(base=new_base, datastore=self.datastore,
-                                   filename=filename, name=name,
+                                       filename=filename, name=self.name,
                                        size=self.size, type=new_type)
 
             queue_name = self.datastore.hostname + ".storage"
@@ -246,31 +239,38 @@ class Disk(TimeStampedModel):
 
             disk.ready = True
             disk.save()
-        act.finish('SUCCESS')
 
             return disk
 
 
-class DiskActivity(TimeStampedModel):
-    activity_code = CharField(verbose_name=_('activity_code'), max_length=100)
-    task_uuid = CharField(verbose_name=_('task_uuid'), blank=True,
-                          max_length=50, null=True, unique=True)
-    disk = ForeignKey(Disk, verbose_name=_('disk'),
-                      related_name='activity_log')
-    user = ForeignKey(User, verbose_name=_('user'), blank=True, null=True)
-    started = DateTimeField(verbose_name=_('started'), blank=True, null=True)
-    finished = DateTimeField(verbose_name=_('finished'), blank=True, null=True)
-    result = TextField(verbose_name=_('result'), blank=True, null=True)
-    state = CharField(verbose_name=_('state'), default='PENDING',
-                      max_length=50)
-
-    def update_state(self, new_state):
-        self.state = new_state
-        self.save()
+class DiskActivity(ActivityModel):
+    disk = ForeignKey(Disk, related_name='activity_log',
+                      help_text=_('Disk this activity works on.'),
+                      verbose_name=_('disk'))
 
-    def finish(self, result=None):
-        if not self.finished:
-            self.finished = timezone.now()
-            self.result = result
-            self.state = 'COMPLETED'
-            self.save()
+    @classmethod
+    def create(cls, code_suffix, disk, task_uuid=None, user=None):
+        act = cls(activity_code='storage.Disk.' + code_suffix,
+                  disk=disk, parent=None, started=timezone.now(),
+                  task_uuid=task_uuid, user=user)
+        act.save()
+        return act
+
+    def create_sub(self, code_suffix, task_uuid=None):
+        act = DiskActivity(
+            activity_code=self.activity_code + '.' + code_suffix,
+            disk=self.disk, parent=self, started=timezone.now(),
+            task_uuid=task_uuid, user=self.user)
+        act.save()
+        return act
+
+    @contextmanager
+    def sub_activity(self, code_suffix, task_uuid=None):
+        act = self.create_sub(code_suffix, task_uuid)
+        return activitycontextimpl(act)
+
+
+@contextmanager
+def disk_activity(code_suffix, disk, task_uuid=None, user=None):
+    act = DiskActivity.create(code_suffix, disk, task_uuid, user)
+    return activitycontextimpl(act)

circle/storage/tasks/local_tasks.py

@@ -7,8 +7,8 @@ def deploy(disk, user):
 
 
 @celery.task
-def remove(disk, user):
-    disk.remove(task_uuid=remove.request.id, user=user)
+def destroy(disk, user):
+    disk.destroy(task_uuid=destroy.request.id, user=user)
 
 
 @celery.task

circle/vm/migrations/0004_auto__add_field_instance_destoryed.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Instance.destoryed'
+        db.add_column(u'vm_instance', 'destoryed',
+                      self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Instance.destoryed'
+        db.delete_column(u'vm_instance', 'destoryed')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
+            'ipv6': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'removed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'vm.instance': {
+            'Meta': {'ordering': "['pk']", 'object_name': 'Instance'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'active_since': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'destoryed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'instance_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.Node']"}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'pw': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NOSTATE'", 'max_length': '20'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.InstanceTemplate']"}),
+            'time_of_delete': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'time_of_suspend': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'vnc_port': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.instanceactivity': {
+            'Meta': {'object_name': 'InstanceActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Instance']"}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '50'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instancetemplate': {
+            'Meta': {'ordering': "['name']", 'object_name': 'InstanceTemplate'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'template_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'template_set'", 'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceTemplate']", 'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '10'}),
+            'system': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.interface': {
+            'Meta': {'object_name': 'Interface'},
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.Instance']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vm_interface'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.interfacetemplate': {
+            'Meta': {'object_name': 'InterfaceTemplate'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'managed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.InstanceTemplate']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.lease': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Lease'},
+            'delete_interval_seconds': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'suspend_interval_seconds': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.namedbaseresourceconfig': {
+            'Meta': {'object_name': 'NamedBaseResourceConfig'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.node': {
+            'Meta': {'object_name': 'Node'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.nodeactivity': {
+            'Meta': {'object_name': 'NodeActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Node']"}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '50'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vm']
\ No newline at end of file

circle/vm/migrations/0005_auto__del_field_instanceactivity_state__add_field_instanceactivity_par.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'InstanceActivity.state'
+        db.delete_column(u'vm_instanceactivity', 'state')
+
+        # Adding field 'InstanceActivity.parent'
+        db.add_column(u'vm_instanceactivity', 'parent',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['vm.InstanceActivity'], null=True, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'NodeActivity.status'
+        db.delete_column(u'vm_nodeactivity', 'status')
+
+        # Adding field 'NodeActivity.parent'
+        db.add_column(u'vm_nodeactivity', 'parent',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['vm.NodeActivity'], null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'InstanceActivity.state'
+        db.add_column(u'vm_instanceactivity', 'state',
+                      self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=50),
+                      keep_default=False)
+
+        # Deleting field 'InstanceActivity.parent'
+        db.delete_column(u'vm_instanceactivity', 'parent_id')
+
+        # Adding field 'NodeActivity.status'
+        db.add_column(u'vm_nodeactivity', 'status',
+                      self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=50),
+                      keep_default=False)
+
+        # Deleting field 'NodeActivity.parent'
+        db.delete_column(u'vm_nodeactivity', 'parent_id')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'vm.instance': {
+            'Meta': {'ordering': "['pk']", 'object_name': 'Instance'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'active_since': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'destoryed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'instance_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.Node']"}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'pw': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NOSTATE'", 'max_length': '20'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.InstanceTemplate']"}),
+            'time_of_delete': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'time_of_suspend': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'vnc_port': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.instanceactivity': {
+            'Meta': {'object_name': 'InstanceActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Instance']"}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instancetemplate': {
+            'Meta': {'ordering': "['name']", 'object_name': 'InstanceTemplate'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'template_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'template_set'", 'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceTemplate']", 'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '10'}),
+            'system': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.interface': {
+            'Meta': {'object_name': 'Interface'},
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.Instance']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vm_interface'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.interfacetemplate': {
+            'Meta': {'object_name': 'InterfaceTemplate'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'managed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.InstanceTemplate']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.lease': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Lease'},
+            'delete_interval_seconds': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'suspend_interval_seconds': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.namedbaseresourceconfig': {
+            'Meta': {'object_name': 'NamedBaseResourceConfig'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.node': {
+            'Meta': {'object_name': 'Node'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.nodeactivity': {
+            'Meta': {'object_name': 'NodeActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Node']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.NodeActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vm']
\ No newline at end of file

circle/vm/migrations/0006_auto__add_unique_instance_node_vnc_port.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding unique constraint on 'Instance', fields ['node', 'vnc_port']
+        db.create_unique(u'vm_instance', ['node_id', 'vnc_port'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Instance', fields ['node', 'vnc_port']
+        db.delete_unique(u'vm_instance', ['node_id', 'vnc_port'])
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'vm.instance': {
+            'Meta': {'ordering': "['pk']", 'unique_together': "(('node', 'vnc_port'),)", 'object_name': 'Instance'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'active_since': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'destoryed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'instance_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.Node']"}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'pw': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NOSTATE'", 'max_length': '20'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.InstanceTemplate']"}),
+            'time_of_delete': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'time_of_suspend': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'vnc_port': ('django.db.models.fields.IntegerField', [], {'default': '2000'})
+        },
+        u'vm.instanceactivity': {
+            'Meta': {'object_name': 'InstanceActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Instance']"}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instancetemplate': {
+            'Meta': {'ordering': "['name']", 'object_name': 'InstanceTemplate'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'template_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'template_set'", 'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceTemplate']", 'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '10'}),
+            'system': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.interface': {
+            'Meta': {'object_name': 'Interface'},
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.Instance']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vm_interface'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.interfacetemplate': {
+            'Meta': {'object_name': 'InterfaceTemplate'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'managed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.InstanceTemplate']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.lease': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Lease'},
+            'delete_interval_seconds': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'suspend_interval_seconds': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.namedbaseresourceconfig': {
+            'Meta': {'object_name': 'NamedBaseResourceConfig'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.node': {
+            'Meta': {'object_name': 'Node'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.nodeactivity': {
+            'Meta': {'object_name': 'NodeActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Node']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.NodeActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vm']
\ No newline at end of file

circle/vm/migrations/0007_auto__chg_field_instance_vnc_port__add_unique_instance_vnc_port__del_u.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Removing unique constraint on 'Instance', fields ['node', 'vnc_port']
+        db.delete_unique(u'vm_instance', ['node_id', 'vnc_port'])
+
+
+        # Changing field 'Instance.vnc_port'
+        db.alter_column(u'vm_instance', 'vnc_port', self.gf('django.db.models.fields.IntegerField')(unique=True, null=True))
+        # Adding unique constraint on 'Instance', fields ['vnc_port']
+        db.create_unique(u'vm_instance', ['vnc_port'])
+
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Instance', fields ['vnc_port']
+        db.delete_unique(u'vm_instance', ['vnc_port'])
+
+
+        # Changing field 'Instance.vnc_port'
+        db.alter_column(u'vm_instance', 'vnc_port', self.gf('django.db.models.fields.IntegerField')())
+        # Adding unique constraint on 'Instance', fields ['node', 'vnc_port']
+        db.create_unique(u'vm_instance', ['node_id', 'vnc_port'])
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'vm.instance': {
+            'Meta': {'ordering': "['pk']", 'object_name': 'Instance'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'active_since': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'destoryed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'instance_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.Node']"}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'pw': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NOSTATE'", 'max_length': '20'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.InstanceTemplate']"}),
+            'time_of_delete': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'time_of_suspend': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'vnc_port': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instanceactivity': {
+            'Meta': {'object_name': 'InstanceActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Instance']"}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instancetemplate': {
+            'Meta': {'ordering': "['name']", 'object_name': 'InstanceTemplate'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'template_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'template_set'", 'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceTemplate']", 'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '10'}),
+            'system': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.interface': {
+            'Meta': {'object_name': 'Interface'},
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.Instance']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vm_interface'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.interfacetemplate': {
+            'Meta': {'object_name': 'InterfaceTemplate'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'managed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.InstanceTemplate']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.lease': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Lease'},
+            'delete_interval_seconds': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'suspend_interval_seconds': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.namedbaseresourceconfig': {
+            'Meta': {'object_name': 'NamedBaseResourceConfig'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.node': {
+            'Meta': {'object_name': 'Node'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.nodeactivity': {
+            'Meta': {'object_name': 'NodeActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Node']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.NodeActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vm']
\ No newline at end of file

circle/vm/migrations/0008_auto__del_field_namedbaseresourceconfig_boot_menu__del_field_namedbase.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'NamedBaseResourceConfig.boot_menu'
+        db.delete_column(u'vm_namedbaseresourceconfig', 'boot_menu')
+
+        # Deleting field 'NamedBaseResourceConfig.raw_data'
+        db.delete_column(u'vm_namedbaseresourceconfig', 'raw_data')
+
+
+    def backwards(self, orm):
+        # Adding field 'NamedBaseResourceConfig.boot_menu'
+        db.add_column(u'vm_namedbaseresourceconfig', 'boot_menu',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Adding field 'NamedBaseResourceConfig.raw_data'
+        db.add_column(u'vm_namedbaseresourceconfig', 'raw_data',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'firewall.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'ttl': ('django.db.models.fields.IntegerField', [], {'default': '600'})
+        },
+        u'firewall.group': {
+            'Meta': {'object_name': 'Group'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'firewall.host': {
+            'Meta': {'object_name': 'Host'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Group']", 'null': 'True', 'blank': 'True'}),
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4': ('firewall.fields.IPAddressField', [], {'unique': 'True', 'max_length': '100'}),
+            'ipv6': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'mac': ('firewall.fields.MACAddressField', [], {'unique': 'True', 'max_length': '17'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'pub_ipv4': ('firewall.fields.IPAddressField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'reverse': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'shared_ip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'firewall.vlan': {
+            'Meta': {'object_name': 'Vlan'},
+            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'dhcp_pool': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Domain']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interface': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+            'network4': ('firewall.fields.IPNetworkField', [], {'max_length': '100'}),
+            'network6': ('firewall.fields.IPNetworkField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'reverse_domain': ('django.db.models.fields.TextField', [], {'default': "'%(d)d.%(c)d.%(b)d.%(a)d.in-addr.arpa'"}),
+            'snat_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'snat_to': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['firewall.Vlan']", 'null': 'True', 'blank': 'True'}),
+            'vid': ('django.db.models.fields.IntegerField', [], {'unique': 'True'})
+        },
+        u'storage.datastore': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DataStore'},
+            'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        u'storage.disk': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Disk'},
+            'base': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'derivatives'", 'null': 'True', 'to': u"orm['storage.Disk']"}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'datastore': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['storage.DataStore']"}),
+            'destroyed': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'dev_num': ('django.db.models.fields.CharField', [], {'default': "'a'", 'max_length': '1'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'size': ('sizefield.models.FileSizeField', [], {}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        u'vm.instance': {
+            'Meta': {'ordering': "['pk']", 'object_name': 'Instance'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'active_since': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'destoryed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'instance_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.Node']"}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'pw': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NOSTATE'", 'max_length': '20'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'instance_set'", 'null': 'True', 'to': u"orm['vm.InstanceTemplate']"}),
+            'time_of_delete': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'time_of_suspend': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+            'vnc_port': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instanceactivity': {
+            'Meta': {'object_name': 'InstanceActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Instance']"}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        u'vm.instancetemplate': {
+            'Meta': {'ordering': "['name']", 'object_name': 'InstanceTemplate'},
+            'access_method': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'boot_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'disks': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'template_set'", 'symmetrical': 'False', 'to': u"orm['storage.Disk']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lease': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'template_set'", 'to': u"orm['vm.Lease']"}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.InstanceTemplate']", 'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'raw_data': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "'NEW'", 'max_length': '10'}),
+            'system': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'vm.interface': {
+            'Meta': {'object_name': 'Interface'},
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']", 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instance': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.Instance']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vm_interface'", 'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.interfacetemplate': {
+            'Meta': {'object_name': 'InterfaceTemplate'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'managed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'interface_set'", 'to': u"orm['vm.InstanceTemplate']"}),
+            'vlan': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Vlan']"})
+        },
+        u'vm.lease': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Lease'},
+            'delete_interval_seconds': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'suspend_interval_seconds': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.namedbaseresourceconfig': {
+            'Meta': {'object_name': 'NamedBaseResourceConfig'},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'max_ram_size': ('django.db.models.fields.IntegerField', [], {}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.node': {
+            'Meta': {'object_name': 'Node'},
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'host': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['firewall.Host']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'num_cores': ('django.db.models.fields.IntegerField', [], {}),
+            'priority': ('django.db.models.fields.IntegerField', [], {}),
+            'ram_size': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'vm.nodeactivity': {
+            'Meta': {'object_name': 'NodeActivity'},
+            'activity_code': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'created': ('model_utils.fields.AutoCreatedField', [], {'default': 'datetime.datetime.now'}),
+            'finished': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('model_utils.fields.AutoLastModifiedField', [], {'default': 'datetime.datetime.now'}),
+            'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'activity_log'", 'to': u"orm['vm.Node']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['vm.NodeActivity']", 'null': 'True', 'blank': 'True'}),
+            'result': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'started': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'task_uuid': ('django.db.models.fields.CharField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vm']
\ No newline at end of file

circle/vm/models.py

+from contextlib import contextmanager
 from datetime import timedelta
 from importlib import import_module
 import logging
@@ -13,6 +14,7 @@ from model_utils.models import TimeStampedModel
 from netaddr import EUI, mac_unix
 
 from .tasks import local_tasks, vm_tasks, net_tasks
+from common.models import ActivityModel, activitycontextimpl
 from firewall.models import Vlan, Host
 from storage.models import Disk
 from acl.models import AclBase
@@ -25,12 +27,12 @@ ACCESS_METHODS = [(key, name) for key, (name, port, transport)
                   in ACCESS_PROTOCOLS.iteritems()]
 ARCHITECTURES = (('x86_64', 'x86-64 (64 bit)'),
                  ('i686', 'x86 (32 bit)'))
+VNC_PORT_RANGE = (2000, 65536)  # inclusive start, exclusive end
 
 
 class BaseResourceConfigModel(Model):
 
-    """Abstract base class for models with base resource configuration
-       parameters.
+    """Abstract base for models with base resource configuration parameters.
     """
     num_cores = IntegerField(verbose_name=_('number of cores'),
                              help_text=_('Number of virtual CPU cores '
@@ -44,11 +46,6 @@ class BaseResourceConfigModel(Model):
                      choices=ARCHITECTURES)
     priority = IntegerField(verbose_name=_('priority'),
                             help_text=_('CPU priority.'))
-    boot_menu = BooleanField(verbose_name=_('boot menu'), default=False,
-                             help_text=_(
-                                 'Show boot device selection menu on boot.'))
-    raw_data = TextField(verbose_name=_('raw_data'), blank=True, help_text=_(
-        'Additional libvirt domain parameters in XML format.'))
 
     class Meta:
         abstract = True
@@ -66,6 +63,22 @@ class NamedBaseResourceConfig(BaseResourceConfigModel, TimeStampedModel):
         return self.name
 
 
+class VirtualMachineDescModel(BaseResourceConfigModel):
+    """Abstract base for virtual machine describing models.
+    """
+    access_method = CharField(max_length=10, choices=ACCESS_METHODS,
+                              verbose_name=_('access method'),
+                              help_text=_('Primary remote access method.'))
+    boot_menu = BooleanField(verbose_name=_('boot menu'), default=False,
+                             help_text=_(
+                                 'Show boot device selection menu on boot.'))
+    raw_data = TextField(verbose_name=_('raw_data'), blank=True, help_text=_(
+        'Additional libvirt domain parameters in XML format.'))
+
+    class Meta:
+        abstract = True
+
+
 class Node(TimeStampedModel):
 
     """A VM host machine, a hypervisor.
@@ -99,38 +112,37 @@ class Node(TimeStampedModel):
         return self.name
 
 
-class NodeActivity(TimeStampedModel):
-    activity_code = CharField(verbose_name=_('activity code'),
-                              max_length=100)  # TODO
-    task_uuid = CharField(verbose_name=_('task_uuid'), blank=True,
-                          max_length=50, null=True, unique=True, help_text=_(
-                              'Celery task unique identifier.'))
-    node = ForeignKey(Node, verbose_name=_('node'),
-                      related_name='activity_log',
-                      help_text=_('Node this activity works on.'))
-    user = ForeignKey(User, verbose_name=_('user'), blank=True, null=True,
-                      help_text=_('The person who started this activity.'))
-    started = DateTimeField(verbose_name=_('started at'),
-                            blank=True, null=True,
-                            help_text=_('Time of activity initiation.'))
-    finished = DateTimeField(verbose_name=_('finished at'),
-                             blank=True, null=True,
-                             help_text=_('Time of activity finalization.'))
-    result = TextField(verbose_name=_('result'), blank=True, null=True,
-                       help_text=_('Human readable result of activity.'))
-    status = CharField(verbose_name=_('status'), default='PENDING',
-                       max_length=50, help_text=_('Actual state of activity'))
-
-    def update_state(self, new_state):
-        self.state = new_state
-        self.save()
+class NodeActivity(ActivityModel):
+    node = ForeignKey(Node, related_name='activity_log',
+                      help_text=_('Node this activity works on.'),
+                      verbose_name=_('node'))
 
-    def finish(self, result=None):
-        if not self.finished:
-            self.finished = timezone.now()
-            self.result = result
-            self.state = 'COMPLETED'
-            self.save()
+    @classmethod
+    def create(cls, code_suffix, node, task_uuid=None, user=None):
+        act = cls(activity_code='vm.Node.' + code_suffix,
+                  node=node, parent=None, started=timezone.now(),
+                  task_uuid=task_uuid, user=user)
+        act.save()
+        return act
+
+    def create_sub(self, code_suffix, task_uuid=None):
+        act = NodeActivity(
+            activity_code=self.activity_code + '.' + code_suffix,
+            node=self.node, parent=self, started=timezone.now(),
+            task_uuid=task_uuid, user=self.user)
+        act.save()
+        return act
+
+    @contextmanager
+    def sub_activity(self, code_suffix, task_uuid=None):
+        act = self.create_sub(code_suffix, task_uuid)
+        return activitycontextimpl(act)
+
+
+@contextmanager
+def node_activity(code_suffix, node, task_uuid=None, user=None):
+    act = InstanceActivity.create(code_suffix, node, task_uuid, user)
+    return activitycontextimpl(act)
 
 
 class Lease(Model):
@@ -168,7 +180,7 @@ class Lease(Model):
         return self.name
 
 
-class InstanceTemplate(BaseResourceConfigModel, TimeStampedModel):
+class InstanceTemplate(VirtualMachineDescModel, TimeStampedModel):
 
     """Virtual machine template.
 
@@ -199,9 +211,6 @@ class InstanceTemplate(BaseResourceConfigModel, TimeStampedModel):
                        help_text=(_('Name of operating system in '
                                     'format like "%s".') %
                                   'Ubuntu 12.04 LTS Desktop amd64'))
-    access_method = CharField(max_length=10, choices=ACCESS_METHODS,
-                              verbose_name=_('access method'),
-                              help_text=_('Primary remote access method.'))
     state = CharField(max_length=10, choices=STATES, default='NEW')
     disks = ManyToManyField(Disk, verbose_name=_('disks'),
                             related_name='template_set',
@@ -256,7 +265,7 @@ class InterfaceTemplate(Model):
         verbose_name_plural = _('interface templates')
 
 
-class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
+class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
 
     """Virtual machine instance.
 
@@ -288,41 +297,42 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
         ('owner', _('owner')),        # superuser, can delete, delegate perms
     )
     name = CharField(blank=True, max_length=100, verbose_name=_('name'),
-                     help_text=_('Human readable name of instance.'))
+                     help_text=_("Human readable name of instance."))
     description = TextField(blank=True, verbose_name=_('description'))
     template = ForeignKey(InstanceTemplate, blank=True, null=True,
                           related_name='instance_set',
-                          help_text=_('Template the instance derives from.'),
+                          help_text=_("Template the instance derives from."),
                           verbose_name=_('template'))
-    pw = CharField(help_text=_('Original password of the instance.'),
+    pw = CharField(help_text=_("Original password of the instance."),
                    max_length=20, verbose_name=_('password'))
     time_of_suspend = DateTimeField(blank=True, default=None, null=True,
                                     verbose_name=_('time of suspend'),
-                                    help_text=_('Proposed time of automatic '
-                                                'suspension.'))
+                                    help_text=_("Proposed time of automatic "
+                                                "suspension."))
     time_of_delete = DateTimeField(blank=True, default=None, null=True,
                                    verbose_name=_('time of delete'),
-                                   help_text=_('Proposed time of automatic '
-                                               'suspension.'))
+                                   help_text=_("Proposed time of automatic "
+                                               "deletion."))
     active_since = DateTimeField(blank=True, null=True,
-                                 help_text=_('Time stamp of successful '
-                                             'boot report.'),
+                                 help_text=_("Time stamp of successful "
+                                             "boot report."),
                                  verbose_name=_('active since'))
     node = ForeignKey(Node, blank=True, null=True,
                       related_name='instance_set',
-                      help_text=_('Current hypervisor of this instance.'),
+                      help_text=_("Current hypervisor of this instance."),
                       verbose_name=_('host node'))
     state = CharField(choices=STATES, default='NOSTATE', max_length=20)
     disks = ManyToManyField(Disk, related_name='instance_set',
-                            help_text=_('Set of mounted disks.'),
+                            help_text=_("Set of mounted disks."),
                             verbose_name=_('disks'))
-    lease = ForeignKey(Lease, help_text=_('Preferred expiration periods.'))
-    access_method = CharField(max_length=10, choices=ACCESS_METHODS,
-                              help_text=_('Primary remote access method.'),
-                              verbose_name=_('access method'))
-    vnc_port = IntegerField(verbose_name=_('vnc_port'),
-                            help_text=_('TCP port where VNC console listens.'))
+    lease = ForeignKey(Lease, help_text=_("Preferred expiration periods."))
+    vnc_port = IntegerField(blank=True, default=None, null=True,
+                            help_text=_("TCP port where VNC console listens."),
+                            unique=True, verbose_name=_('vnc_port'))
     owner = ForeignKey(User)
+    destoryed = DateTimeField(blank=True, null=True,
+                              help_text=_("The virtual machine's time of "
+                                          "destruction."))
 
     class Meta:
         ordering = ['pk', ]
@@ -330,7 +340,8 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
         verbose_name_plural = _('instances')
 
     def __unicode__(self):
-        return self.name
+        parts = [self.name, "(" + str(self.id) + ")"]
+        return " ".join([s for s in parts if s != ""])
 
     @classmethod
     def create_from_template(cls, template, owner, **kwargs):
@@ -358,9 +369,11 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
         inst = cls(**kwargs)
         # save instance
         inst.save()
-        for disk in template.disks.all():
-            inst.disks.add(disk.get_exclusive())
         # create related entities
+        disks = kwargs.get('disks', template.disks.all())
+        for disk in disks:
+            inst.disks.add(disk.get_exclusive())
+
         for iftmpl in template.interface_set.all():
             i = Interface.create_from_template(instance=inst,
                                                template=iftmpl,
@@ -387,6 +400,15 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
         return 'cloud-' + str(self.id)
 
     @property
+    def mem_dump(self):
+        """Return the path for the memory dump.
+
+        It is always on the first hard drive storage named cloud-<id>.dump
+        """
+        path = self.disks.all()[0].datastore.path
+        return path + '/' + self.vm_name + '.dump'
+
+    @property
     def primary_host(self):
         interfaces = self.interface_set.select_related('host')
         hosts = [i.host for i in interfaces if i.host]
@@ -478,8 +500,8 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
         return {
             'name': self.vm_name,
             'vcpu': self.num_cores,
-            'memory': self.ram_size,
-            'memory_max': self.max_ram_size,
+            'memory': self.ram_size * 1024,  # convert from MiB to KiB
+            'memory_max': self.max_ram_size * 1024,  # convert from MiB to KiB
             'cpu_share': self.priority,
             'arch': self.arch,
             'boot_menu': self.boot_menu,
@@ -495,207 +517,269 @@ class Instance(AclBase, BaseResourceConfigModel, TimeStampedModel):
             'raw_data': "" if not self.raw_data else self.raw_data
         }
 
+    def get_remote_queue_name(self, queue_id):
+        """Get the remote worker queue name of this instance with the specified
+           queue ID.
+        """
+        return self.node.host.hostname + "." + queue_id
+
+    def renew(self, which='both'):
+        """Renew virtual machine instance leases.
+        """
+        if which not in ['suspend', 'delete', 'both']:
+            raise ValueError('No such expiration type.')
+        if which in ['suspend', 'both']:
+            self.time_of_suspend = timezone.now() + self.lease.suspend_interval
+        if which in ['delete', 'both']:
+            self.time_of_delete = timezone.now() + self.lease.delete_interval
+        self.save()
+
     def deploy(self, user=None, task_uuid=None):
-        """ Deploy new virtual machine with network
-        1. Schedule
-        """
-        act = InstanceActivity(activity_code='vm.Instance.deploy')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
+        """Deploy new virtual machine with network
+
+        :param self: The virtual machine to deploy.
+        :type self: vm.models.Instance
+
+        :param user: The user who's issuing the command.
+        :type user: django.contrib.auth.models.User
+
+        :param task_uuid: The task's UUID, if the command is being executed
+                          asynchronously.
+        :type task_uuid: str
+        """
+        with instance_activity(code_suffix='deploy', instance=self,
+                               task_uuid=task_uuid, user=user) as act:
+
+            # Find unused port for VNC
+            if self.vnc_port is None:
+                used = Instance.objects.values_list('vnc_port', flat=True)
+                for p in xrange(*VNC_PORT_RANGE):
+                    if p not in used:
+                        self.vnc_port = p
+                        break
+                else:
+                    raise Exception("No unused port could be found for VNC.")
 
             # Schedule
-        act.update_state('PENDING')
             self.node = scheduler.get_node(self, Node.objects.all())
             self.save()
 
-        # Create virtual images
-        act.update_state('PREPARING DISKS')
+            # Deploy virtual images
+            with act.sub_activity('deploying_disks'):
                 for disk in self.disks.all():
                     disk.deploy()
 
+            queue_name = self.get_remote_queue_name('vm')
             # Deploy VM on remote machine
-        act.update_state('DEPLOYING VM')
-        queue_name = self.node.host.hostname + ".vm"
-        vm_tasks.create.apply_async(args=[self.get_vm_desc()],
+            with act.sub_activity('deploying_vm'):
+                vm_tasks.deploy.apply_async(args=[self.get_vm_desc()],
                                             queue=queue_name).get()
 
             # Estabilish network connection (vmdriver)
-        act.update_state('DEPLOYING NET')
+            with act.sub_activity('deploying_net'):
                 for net in self.interface_set.all():
                     net.deploy()
 
             # Resume vm
-        act.update_state('BOOTING')
+            with act.sub_activity('booting'):
                 vm_tasks.resume.apply_async(args=[self.vm_name],
                                             queue=queue_name).get()
 
-        act.finish(result='SUCCESS')
+    def deploy_async(self, user=None):
+        """Execute deploy asynchronously.
+        """
+        return local_tasks.deploy.apply_async(args=[self, user],
+                                              queue="localhost.man")
 
     def destroy(self, user=None, task_uuid=None):
-        """ Remove Instance with its networks.
+        """Remove virtual machine and its networks.
+
+        :param self: The virtual machine to destroy.
+        :type self: vm.models.Instance
+
+        :param user: The user who's issuing the command.
+        :type user: django.contrib.auth.models.User
+
+        :param task_uuid: The task's UUID, if the command is being executed
+                          asynchronously.
+        :type task_uuid: str
         """
-        act = InstanceActivity(activity_code='vm.Instance.destroy')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
-        # Delete instance
+        with instance_activity(code_suffix='destroy', instance=self,
+                               task_uuid=task_uuid, user=user) as act:
+
+            # Destroy networks
+            with act.sub_activity('destroying_net'):
+                for net in self.interface_set.all():
+                    net.destroy()
+
+            # Destroy virtual machine
+            with act.sub_activity('destroying_vm'):
+                queue_name = self.get_remote_queue_name('vm')
                 vm_tasks.destroy.apply_async(args=[self.vm_name],
                                              queue=queue_name).get()
-        # Delete networks
-        for net in self.interface_set.all():
-            net.remove()
-        act.finish(result="DONE")
 
-    def destroy_async(self, user=None):
-        """Execute destroy() asyncrhonusly.
-        """
-        local_tasks.destroy.apply_async(args=[self, user],
-                                        queue="localhost.man")
+            # Destroy disks
+            with act.sub_activity('destroying_disks'):
+                for disk in self.disks.all():
+                    disk.destroy()
 
-    def deploy_async(self, user=None):
-        """Execute deploy() asynchronously.
+            # Clear node and VNC port association
+            self.node = None
+            self.vnc_port = None
+
+            self.destoryed = timezone.now()
+            self.save()
+
+    def destroy_async(self, user=None):
+        """Execute destroy asynchronously.
         """
-        local_tasks.deploy.apply_async(args=[self, user],
+        return local_tasks.destroy.apply_async(args=[self, user],
                                                queue="localhost.man")
 
     def sleep(self, user=None, task_uuid=None):
         """Suspend virtual machine with memory dump.
         """
-        act = InstanceActivity(activity_code='vm.Instance.sleep')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
-        vm_tasks.sleep.apply_async(args=[self.vm_name],
+        with instance_activity(code_suffix='sleep', instance=self,
+                               task_uuid=task_uuid, user=user):
+
+            queue_name = self.get_remote_queue_name('vm')
+            vm_tasks.sleep.apply_async(args=[self.vm_name, self.mem_dump],
                                        queue=queue_name).get()
-        act.finish(result='SUCCESS')
 
     def sleep_async(self, user=None):
-        """Execute suspend() asynchronously.
+        """Execute sleep asynchronously.
         """
-        local_tasks.sleep.apply_async(args=[self, user], queue="localhost.man")
+        return local_tasks.sleep.apply_async(args=[self, user],
+                                             queue="localhost.man")
 
     def wake_up(self, user=None, task_uuid=None):
-        act = InstanceActivity(activity_code='vm.Instance.resume')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
-        vm_tasks.resume.apply_async(args=[self.vm_name],
+        with instance_activity(code_suffix='wake_up', instance=self,
+                               task_uuid=task_uuid, user=user):
+
+            queue_name = self.get_remote_queue_name('vm')
+            vm_tasks.resume.apply_async(args=[self.vm_name, self.dump_mem],
                                         queue=queue_name).get()
-        act.finish(result='SUCCESS')
 
     def wake_up_async(self, user=None):
-        """Execute resume() asynchronously.
+        """Execute wake_up asynchronously.
         """
-        local_tasks.resume.apply_async(args=[self, user],
+        return local_tasks.wake_up.apply_async(args=[self, user],
                                                queue="localhost.man")
 
     def shutdown(self, user=None, task_uuid=None):
         """Shutdown virtual machine with ACPI signal.
         """
-        act = InstanceActivity(activity_code='vm.Instance.power_off')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
+        with instance_activity(code_suffix='shutdown', instance=self,
+                               task_uuid=task_uuid, user=user):
+
+            queue_name = self.get_remote_queue_name('vm')
             vm_tasks.shutdown.apply_async(args=[self.vm_name],
                                           queue=queue_name).get()
-        act.finish(result='SUCCESS')
 
     def shutdown_async(self, user=None):
         """Execute shutdown asynchronously.
         """
-        local_tasks.shutdown.apply_async(args=[self, user],
+        return local_tasks.shutdown.apply_async(args=[self, user],
                                                 queue="localhost.man")
 
     def reset(self, user=None, task_uuid=None):
         """Reset virtual machine (reset button)
         """
-        act = InstanceActivity(activity_code='vm.Instance.restart')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
+        with instance_activity(code_suffix='reset', instance=self,
+                               task_uuid=task_uuid, user=user):
+
+            queue_name = self.get_remote_queue_name('vm')
             vm_tasks.restart.apply_async(args=[self.vm_name],
                                          queue=queue_name).get()
-        act.finish(result='SUCCESS')
 
     def reset_async(self, user=None):
         """Execute reset asynchronously.
         """
-        local_tasks.restart.apply_async(args=[self, user],
+        return local_tasks.restart.apply_async(args=[self, user],
                                                queue="localhost.man")
 
     def reboot(self, user=None, task_uuid=None):
-        """Reboot virtual machin with ctr+alt+del signal.
+        """Reboot virtual machine with Ctrl+Alt+Del signal.
         """
-        act = InstanceActivity(activity_code='vm.Instance.reboot')
-        act.instance = self
-        act.user = user
-        act.started = timezone.now()
-        act.task_uuid = task_uuid
-        act.save()
-        queue_name = self.node.host.hostname + ".vm"
+        with instance_activity(code_suffix='reboot', instance=self,
+                               task_uuid=task_uuid, user=user):
+
+            queue_name = self.get_remote_queue_name('vm')
             vm_tasks.reboot.apply_async(args=[self.vm_name],
                                         queue=queue_name).get()
-        act.finish(result='SUCCESS')
 
     def reboot_async(self, user=None):
         """Execute reboot asynchronously.
         """
-        local_tasks.reboot.apply_async(args=[self, user],
+        return local_tasks.reboot.apply_async(args=[self, user],
                                               queue="localhost.man")
 
-    def renew(self, which='both'):
-        """Renew virtual machine instance leases.
-        """
-        if which not in ['suspend', 'delete', 'both']:
-            raise ValueError('No such expiration type.')
-        if which in ['suspend', 'both']:
-            self.time_of_suspend = timezone.now() + self.lease.suspend_interval
-        if which in ['delete', 'both']:
-            self.time_of_delete = timezone.now() + self.lease.delete_interval
-        self.save()
+    def save_as_template(self, name, **kwargs):
+        # prepare parameters
+        kwargs.setdefault('name', name)
+        kwargs.setdefault('description', self.description)
+        kwargs.setdefault('parent', self.template)
+        kwargs.setdefault('num_cores', self.num_cores)
+        kwargs.setdefault('ram_size', self.ram_size)
+        kwargs.setdefault('max_ram_size', self.max_ram_size)
+        kwargs.setdefault('arch', self.arch)
+        kwargs.setdefault('priority', self.priority)
+        kwargs.setdefault('boot_menu', self.boot_menu)
+        kwargs.setdefault('raw_data', self.raw_data)
+        kwargs.setdefault('lease', self.lease)
+        kwargs.setdefault('access_method', self.access_method)
+        kwargs.setdefault('system', self.template.system
+                          if self.template else None)
+        # create template and do additional setup
+        tmpl = InstanceTemplate(**kwargs)
+        # save template
+        tmpl.save()
+        # create related entities
+        for disk in self.disks.all():
+            try:
+                d = disk.save_as()
+            except Disk.WrongDiskTypeError:
+                d = disk
 
+            tmpl.disks.add(d)
 
-class InstanceActivity(TimeStampedModel):
-    activity_code = CharField(verbose_name=_('activity_code'), max_length=100)
-    task_uuid = CharField(verbose_name=_('task_uuid'), blank=True,
-                          max_length=50, null=True, unique=True)
-    instance = ForeignKey(Instance, verbose_name=_('instance'),
-                          related_name='activity_log')
-    user = ForeignKey(User, verbose_name=_('user'), blank=True, null=True)
-    started = DateTimeField(verbose_name=_('started'), blank=True, null=True)
-    finished = DateTimeField(verbose_name=_('finished'), blank=True, null=True)
-    result = TextField(verbose_name=_('result'), blank=True, null=True)
-    state = CharField(verbose_name=_('state'),
-                      default='PENDING', max_length=50)
-
-    def update_state(self, new_state):
-        self.state = new_state
-        self.save()
+        for i in self.interface_set.all():
+            i.save_as_template(tmpl)
+
+        return tmpl
 
-    def finish(self, result=None):
-        if not self.finished:
-            self.finished = timezone.now()
-            self.result = result
-            self.state = 'COMPLETED'
-            self.save()
+
+class InstanceActivity(ActivityModel):
+    instance = ForeignKey(Instance, related_name='activity_log',
+                          help_text=_('Instance this activity works on.'),
+                          verbose_name=_('instance'))
+
+    @classmethod
+    def create(cls, code_suffix, instance, task_uuid=None, user=None):
+        act = cls(activity_code='vm.Instance.' + code_suffix,
+                  instance=instance, parent=None, started=timezone.now(),
+                  task_uuid=task_uuid, user=user)
+        act.save()
+        return act
+
+    def create_sub(self, code_suffix, task_uuid=None):
+        act = InstanceActivity(
+            activity_code=self.activity_code + '.' + code_suffix,
+            instance=self.instance, parent=self, started=timezone.now(),
+            task_uuid=task_uuid, user=self.user)
+        act.save()
+        return act
+
+    @contextmanager
+    def sub_activity(self, code_suffix, task_uuid=None):
+        act = self.create_sub(code_suffix, task_uuid)
+        return activitycontextimpl(act)
+
+
+@contextmanager
+def instance_activity(code_suffix, instance, task_uuid=None, user=None):
+    act = InstanceActivity.create(code_suffix, instance, task_uuid, user)
+    return activitycontextimpl(act)
 
 
 class Interface(Model):
@@ -732,12 +816,11 @@ class Interface(Model):
 
     def get_vmnetwork_desc(self):
         return {
-            'name': 'cloud-' + str(self.instance.id)
-                             + '-' + str(self.vlan.vid),
+            'name': self.__unicode__(),
             'bridge': 'cloud',
             'mac': str(self.mac),
-            'ipv4': self.host.ipv4 if self.host is not None else None,
-            'ipv6': self.host.ipv6 if self.host is not None else None,
+            'ipv4': str(self.host.ipv4) if self.host is not None else None,
+            'ipv6': str(self.host.ipv6) if self.host is not None else None,
             'vlan': self.vlan.vid,
             'managed': self.host is not None
         }
@@ -745,12 +828,12 @@ class Interface(Model):
     def deploy(self, user=None, task_uuid=None):
         net_tasks.create.apply_async(
             args=[self.get_vmnetwork_desc()],
-            queue=self.instance.node.host.hostname + '.net')
+            queue=self.instance.get_remote_queue_name('net'))
 
     def destroy(self, user=None, task_uuid=None):
         net_tasks.destroy.apply_async(
             args=[self.get_vmnetwork_desc()],
-            queue=self.instance.node.host.hostname + '.net')
+            queue=self.instance.get_remote_queue_name('net'))
 
     @classmethod
     def create_from_template(cls, instance, template, owner=None):
@@ -775,3 +858,11 @@ class Interface(Model):
         iface = cls(vlan=template.vlan, host=host, instance=instance)
         iface.save()
         return iface
+
+    def save_as_template(self, instance_template):
+        """Create a template based on this interface.
+        """
+        i = InterfaceTemplate(vlan=self.vlan, managed=self.host is not None,
+                              template=instance_template)
+        i.save()
+        return i

circle/vm/tasks/local_tasks.py

 from manager.mancelery import celery
 
-# TODO: Keep syncronhised with Instance funcs
+# TODO: Keep synchronised with Instance funcs
+
 
 @celery.task
 def deploy(instance, user):
-    ''' Call Insance.deploy() from celery task.
-    '''
     instance.deploy(task_uuid=deploy.request.id, user=user)
 
 
-def destroy():
-    pass
+@celery.task
+def destroy(instance, user):
+    instance.destroy(task_uuid=destroy.request.id, user=user)
 
 
-def save_as():
-    pass
+@celery.task
+def sleep(instance, user):
+    instance.sleep(task_uuid=sleep.request.id, user=user)
 
 
-def suspend():
-    pass
+@celery.task
+def wake_up(instance, user):
+    instance.wake_up(task_uuid=wake_up.request.id, user=user)
 
 
-def resume():
-    pass
+@celery.task
+def shutdown(instance, user):
+    instance.shutdown(task_uuid=shutdown.request.id, user=user)
 
 
-def restart():
-    pass
+@celery.task
+def reset(instance, user):
+    instance.reset(task_uuid=reset.request.id, user=user)
 
 
-def reset():
-    pass
+@celery.task
+def reboot(instance, user):
+    instance.reboot(task_uuid=reboot.request.id, user=user)
 
 
-def migrate():
-    pass
+@celery.task
+def migrate(instance, user):
+    instance.migrate(task_uuid=migrate.request.id, user=user)