git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add controllerUrl to network object
[plstackapi.git]
/
planetstack
/
core
/
models
/
network.py
diff --git
a/planetstack/core/models/network.py
b/planetstack/core/models/network.py
index
3c5a19b
..
0b3400a
100644
(file)
--- a/
planetstack/core/models/network.py
+++ b/
planetstack/core/models/network.py
@@
-65,6
+65,8
@@
def ValidateNatList(ports):
class NetworkTemplate(PlCoreBase):
VISIBILITY_CHOICES = (('public', 'public'), ('private', 'private'))
TRANSLATION_CHOICES = (('none', 'none'), ('NAT', 'NAT'))
class NetworkTemplate(PlCoreBase):
VISIBILITY_CHOICES = (('public', 'public'), ('private', 'private'))
TRANSLATION_CHOICES = (('none', 'none'), ('NAT', 'NAT'))
+ TOPOLOGY_CHOICES = (('bigswitch', 'BigSwitch'), ('physical', 'Physical'), ('custom', 'Custom'))
+ CONTROLLER_CHOICES = ((None, 'None'), ('onos', 'ONOS'), ('custom', 'Custom'))
name = models.CharField(max_length=32)
description = models.CharField(max_length=1024, blank=True, null=True)
name = models.CharField(max_length=32)
description = models.CharField(max_length=1024, blank=True, null=True)
@@
-73,6
+75,8
@@
class NetworkTemplate(PlCoreBase):
translation = models.CharField(max_length=30, choices=TRANSLATION_CHOICES, default="none")
sharedNetworkName = models.CharField(max_length=30, blank=True, null=True)
sharedNetworkId = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
translation = models.CharField(max_length=30, choices=TRANSLATION_CHOICES, default="none")
sharedNetworkName = models.CharField(max_length=30, blank=True, null=True)
sharedNetworkId = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
+ topologyKind = models.CharField(null=False, blank=False, max_length=30, choices=TOPOLOGY_CHOICES, default="BigSwitch")
+ controllerKind = models.CharField(null=True, blank=True, max_length=30, choices=CONTROLLER_CHOICES, default=None)
def __unicode__(self): return u'%s' % (self.name)
def __unicode__(self): return u'%s' % (self.name)
@@
-90,6
+94,10
@@
class Network(PlCoreBase):
slices = models.ManyToManyField(Slice, blank=True, related_name="networks", through="NetworkSlice")
slivers = models.ManyToManyField(Sliver, blank=True, related_name="networks", through="NetworkSliver")
slices = models.ManyToManyField(Slice, blank=True, related_name="networks", through="NetworkSlice")
slivers = models.ManyToManyField(Sliver, blank=True, related_name="networks", through="NetworkSliver")
+ topologyParameters = models.TextField(null=True, blank=True)
+ controllerUrl = models.CharField(null=True, blank=True, max_length=1024)
+ controllerParameters = models.TextField(null=True, blank=True)
+
# for observer/manager
network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")
# for observer/manager
network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network")
router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id")