From: smbaker Date: Sat, 13 Jul 2013 12:26:50 +0000 (-0700) Subject: network model, wip X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=0839599ac32e2b8ac72be4f5e64e6b9854b22e28 network model, wip --- diff --git a/planetstack/core/models/network.py b/planetstack/core/models/network.py index 9a51702..4b10bfe 100644 --- a/planetstack/core/models/network.py +++ b/planetstack/core/models/network.py @@ -12,7 +12,7 @@ class Network(PlCoreBase): ports = models.CharField(max_length=1024) labels = models.CharField(max_length=1024) slice = models.ForeignKey(Slice, related_name="networks") - guaranteedBandwidth = models.IntegerField() + guaranteedBandwidth = models.IntegerField(default=0) permittedSlices = models.ManyToManyField(Slice, blank=True, related_name="permittedNetworks") boundSlices = models.ManyToManyField(Slice, blank=True, related_name="boundNetworks") @@ -20,6 +20,7 @@ class Network(PlCoreBase): class Router(PlCoreBase): name = models.CharField(max_length=32) + owner = models.ForeignKey(Slice, related_name="routers") networks = models.ManyToManyField(Network, blank=True, related_name="routers") def __unicode__(self): return u'%s' % (self.name) @@ -39,6 +40,6 @@ class NetworkParameter(PlCoreBase): content_object = generic.GenericForeignKey('content_type', 'object_id') def __unicode__(self): - return self.tagType.name + return self.networkParameterType.name