Changeset d070d9f for starbed_plugin/topdltok.py

Timestamp:

Aug 26, 2012 1:04:18 PM (12 years ago)

Author:

ABDULLA ALWABEL <abdullaalwabel@…>

Branches:

master

Children:

9d40cc9

Parents:

794325b

Message:

Finalize cleaning!

File:

• starbed_plugin/topdltok.py (modified) (3 diffs)

starbed_plugin/topdltok.py

@@ -1 +1 @@
 #!/usr/bin/python
-import federation.topdl as topdl
+#import federation.topdl as topdl
+from deter import topdl
 
 # convert dotted quad netmask to CIDR / notation (i.e., 255.255.255.0 -> 24)
@@ -60 +61 @@
                 ospfd = "/etc/quagga/ospfd.conf"
                 for elt in topo.elements:
-                        if isinstance(elt, topdl.Computer):
+                        if isinstance(elt, topdl.Computer) and (not elt.get_attribute('portal') or elt.get_attribute('portal') == 'false'):
                                 name = str(elt.name)
                                 nodedef = nodedef + 'nodeclass %sclass {\nmethod "thru"\npartition 1\nostype "FreeBSD"\n' % name
@@ -104 +105 @@
                 for sub in topo.substrates:
                         sname = str(sub.name)
+                        sname = sname.replace('-','')
                         laninst = laninst + "netset %s class %s num 1\n" % (sname,lanclass)
                         laninst += "%s[0].ipaddrrange = \"192.168.33.0/24\"\n" % (sname)