Changeset b06744b for fedd/federation

Timestamp:

Feb 7, 2014 2:53:02 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

5f5ce09

Parents:

bea19b7

Message:

DEV push

File:

• fedd/federation/desktop_access.py (modified) (4 diffs)

fedd/federation/desktop_access.py

@@ -342 +342 @@
         port = None
         my_addr = None
+        my_name = None
         for e in top.elements:
             if not isinstance(e, topdl.Computer): continue
             if e.get_attribute('portal') is None: 
+                my_name = e.name
                 # there should be one interface with one IPv4 address
                 if len(e.interface) <1 :
@@ -369 +371 @@
         dscript = os.path.join(self.localdir, 'disconnect')
         local_hosts = os.path.join(self.localdir, 'hosts')
+        zebra_conf = os.path.join(self.localdir, 'zebra.conf')
+        ospfd_conf = os.path.join(self.localdir, 'ospfd.conf')
         try:
             f = open(cscript, 'w')
@@ -393 +397 @@
             print >>f, 'ifconfig tap0 %s netmask 255.255.255.0 up' % \
                     my_addr
-            self.set_route('10.0.0.0/8', f, exp_peer)
+            # self.set_route('10.0.0.0/8', f, exp_peer)
+            print >>f, '/usr/local/sbin/zebra -d -i -f %s' % zebra_conf
+            print >>f, '/usr/local/sbin/ospfd -d -i -f %s' % ospfd_conf
             f.close()
             os.chmod(cscript, 0755)
@@ -400 +406 @@
             print >>f, 'ifconfig tap0 destroy'
             self.unset_route(peer, f)
-            self.unset_route('10.0.0.0/8', f)
+            #self.unset_route('10.0.0.0/8', f)
             print >>f, 'mv /etc/hosts.DETER.fedd.hold /etc/hosts'
+            print >>f, 'kill `cat /var/run/ospfd.pid`'
+            print >>f, 'kill `cat /var/run/zebra.pid`'
             f.close()
             os.chmod(dscript, 0755)
+            f = open(zebra_conf, 'w')
+            print >>f, 'hostname %s' % my_name
+            print >>f, 'interface tap0'
+            f.close()
+            os.chmod(zebra_conf, 0644)
+            f = open(ospfd_conf, 'w')
+            print >>f, 'hostname %s' % my_name
+            print >>f, 'router ospf'
+            print >>f, ' redistribute static'
+            print >>f, ' network %s/24 area 0.0.0.2' % my_addr
         except EnvironmentError, e:
             raise service_error(service_error.internal,