Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / core / models / node.py

diff --git a/planetstack/core/models/node.py b/planetstack/core/models/node.py
index a249628..56aee68 100644 (file)
--- a/planetstack/core/models/node.py
+++ b/planetstack/core/models/node.py
@@ -1,14 +1,21 @@
 import os
 from django.db import models
 from core.models import PlCoreBase
-from core.models import Site
-from core.models import DeploymentNetwork
+from core.models import Site,Deployment
+from core.models import Tag
+from django.contrib.contenttypes import generic
 
 # Create your models here.
 
 class Node(PlCoreBase):
     name = models.CharField(max_length=200, unique=True, help_text="Name of the Node")
     site  = models.ForeignKey(Site, related_name='nodes')
-    deploymentNetwork  = models.ForeignKey(DeploymentNetwork, related_name='nodes')
+    deployment = models.ForeignKey(Deployment, related_name='nodes')
+    tags = generic.GenericRelation(Tag)
 
     def __unicode__(self):  return u'%s' % (self.name)
+
+    @staticmethod
+    def select_by_user(user):
+        qs = Node.objects.all()
+        return qs