Changeset 6256


Ignore:
Timestamp:
Sep 11, 2008, 10:50:55 AM (16 years ago)
Author:
RIck van der Zwet
Message:

Link and LinkPool is not working due the complexity and not logic approch. Viewsor crippled for example. Let's try to link Interface directly to an Interface itself and let's see whether this is going to work. Might need the notion of an Alias, but yet to be defined.

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r6255 r6256  
    1818dist-clean:
    1919#Remove database
    20         @rm -vf sqlite.db
     20        @rm -vf sqllite.db
     21
     22new: init debug

  • README

    r6236 r6256  
    1111
    1212= Hacking =
    13 Install Django trunk revision 8354 to $DJANGOROOT
     13Install Django 1.0 to $DJANGOROOT
    1414
    1515Install Django extentions using http://code.google.com/p/django-command-extensions/wiki/InstallationInstructions
    … …  
    2929To run the developmentserver do
    3030$ cd $SVNROOT
    31 $ ./sampleserver/manage.py runserver 8000 --pythonpath=`pwd` runserver
     31$ ./sampleserver/manage.py runserver 8000 --pythonpath=`pwd`
    3232
    3333

  • exodus/admin.py

    r6254 r6256  
    88admin.site.register(Network)
    99admin.site.register(Node)
    10 admin.site.register(LinkPool)
    11 admin.site.register(Link)
    12 admin.site.register(Interface)
     10admin.site.register(Interface)
    1311admin.site.register(PublicAP)
    1412admin.site.register(DhcpStatic)

  • exodus/models.py

    r6253 r6256  
    5454
    5555class Network(models.Model):
     56        name = models.CharField(max_length=50)
    5657        ipspacestart = models.IPAddressField()
    57         netmask = models.IntegerField()
    58         dnsserver = models.ForeignKey(DnsServer)
     58        netmask = models.IntegerField()
    5959
    6060        def __str__(self):
    61                 return self.domainname
     61                return self.name
    6262
    6363
    … …  
    6565    name = models.CharField(max_length=30, unique=True)
    6666    location = models.ForeignKey(Location)
    67     status = models.CharField(max_length=10, choices=STATUS_CHOICES)
     67    status = models.CharField(max_length=10, choices=STATUS_CHOICES, default=1)
    6868    masterip = models.IPAddressField()
    6969    network = models.ForeignKey(Network,default=1)
    … …  
    7575        return self.name
    7676
    77 class LinkPool(models.Model):
    78         netmask = models.IntegerField(default=30)
    79 
    80 class Link(models.Model):
    81         ip = models.IPAddressField()
    82         shortdesc = models.CharField(max_length=10)
    83         desc = models.CharField(max_length=100)
    84         linkpool = models.ForeignKey(LinkPool)
    85 
    86         def __str__(self):
    87                 return "%s" % (self.shortdesc)
    88 
    89 class Interface(models.Model):
     77class Interface(models.Model):
    9078        node = models.ForeignKey(Node)
    9179        iface = models.CharField(max_length=10, verbose_name="interface")
     80        ip = models.IPAddressField()
    9281        polar = models.CharField(max_length=10, choices=POLAR_CHOICES)
    9382        ssid = models.CharField(max_length=30, blank=True, null=True)
    9483        mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES)
    9584        channel = models.IntegerField(blank=True, null=True)
    96         antenna = models.ForeignKey(Antenna, blank=True, null=True) 
     85        antenna = models.ForeignKey(Antenna, blank=True, null=True)
    9786        type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES)
    98         links = models.ManyToManyField(Link)
     87        shortdesc = models.CharField(max_length=10)
     88        desc = models.CharField(max_length=100)
     89        link = models.ForeignKey('self')
    9990       
    10091        def __str__(self):
    10192                return "%s:%s" % (self.node.name, self.iface)
    10293
    103 
    104        
    10594class PublicAP(models.Model):
    10695    iface = models.ForeignKey(Interface)

  • exodus/urls.py

    r6254 r6256  
    1414databrowse.site.register(Network)
    1515databrowse.site.register(Node)
    16 databrowse.site.register(LinkPool)
    17 databrowse.site.register(Link)
    18 databrowse.site.register(Interface)
     16databrowse.site.register(Interface)
    1917databrowse.site.register(PublicAP)
    2018databrowse.site.register(DhcpStatic)

  • exodus/views.py

    r6254 r6256  
    1919                if form.is_valid():
    2020                        form.save()
    21                         return HttpResponseRedirect("/exodus/")
     21                        return HttpResponseRedirect("/addnode/")
    2222        else:
    2323                form = AddLocationForm()
    … …  
    2727        class Meta:
    2828                model = Node
    29                 exclude = ( 'masterip', )
     29                exclude = ( 'masterip' )
    3030
    3131def addNode(request):
    … …  
    4646                except Node.DoesNotExist:
    4747                        form = AddNodeForm()
    48                 form = AddNodeForm()
    49                 return render_to_response('addnode.html', {'form': form })
     48        return render_to_response('addnode.html', {'form': form })
    5049
    5150def delnode(request):
    … …  
    6564        class Meta:
    6665                model = Interface
    67                 exclude = ( 'ssid', 'mode', 'channel', 'links' )
     66                exclude = ( 'ssid', 'mode', 'channel' )
    6867
    6968def addInterface(request):
    … …  
    8281        return render_to_response('addnic.html', {'form': form })
    8382
    84 class addLinkForm(forms.ModelForm):
    85         class Meta:
    86                 model = Link
     83class addLinkForm(forms.Form):
     84        class Meta:
     85                model = Node
    8786                exclude = ( 'shortdesc', 'desc' )
    8887

  • exodus/wllogic.py

    r6245 r6256  
    11# (c) Roland van Laar
    22
    3 #from exodus.models import Node, Network, Interlink
     3from exodus.models import Node, Network
    44
    55def newSSIDName(node, nic, desc):
Note: See TracChangeset for help on using the changeset viewer.