commit de5450d5e78802e77c397f0833a6f176c137ef81
author Siobhan Tully <stully@verivue.com> Fri Jun 21 11:35:33 2013 -0400
committer Siobhan Tully <stully@verivue.com> Fri Jun 21 11:35:33 2013 -0400
tree 0098c210fef0c8de4f92cee09bc5ace476f75818
parent e4d36821aed0d7b980744d4f3d964fc5377966ab

Added support for Generic Tags.  Tags can be applied to Node, Site, Slice, Sliver.  Adjusted relation_name for SliceTags to not conflict with generic tag.

planetstack/core/models/slice.py

diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py
index 63754e4..74815b2 100644
--- a/planetstack/core/models/slice.py
+++ b/planetstack/core/models/slice.py
@@ -6,6 +6,8 @@
 from core.models import Role
 from core.models import Deployment
 from core.models import ServiceClass
+from core.models import Tag
+from django.contrib.contenttypes import generic
 
 # Create your models here.
 
@@ -21,6 +23,8 @@
     router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")
     subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id")
 
+    tags = generic.GenericRelation(Tag)
+
     serviceClass = models.ForeignKey(ServiceClass, related_name = "slices", null=True, default=ServiceClass.get_default)
     creator = models.ForeignKey(User, related_name='slices', blank=True, null=True)