Attachment 305675 Details for Bug 446743 – patch refined

[patch] patch refined

dns-in-ifcfg-2.patch (text/plain), 2.09 KB, created by Harald Hoyer on 2008-05-16 11:38:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2008-05-16 11:38:04 UTC

Size: 2.09 KB

patch

obsolete

>diff --git a/src/netconfpkg/DeviceList.idl b/src/netconfpkg/DeviceList.idl
>index 3af53af..83408cf 100644
>--- a/src/netconfpkg/DeviceList.idl
>+++ b/src/netconfpkg/DeviceList.idl
>@@ -39,6 +39,11 @@
> 
>       <Slave TYPE="BOOL" VALUE="FALSE"/>
> 
>+      <PrimaryDNS TYPE="STRING" VALUE=""/>
>+      <SecondaryDNS TYPE="STRING" VALUE=""/>
>+      <TertiaryDNS TYPE="STRING" VALUE=""/>
>+      <Searches TYPE="STRING" VALUE=""/>
>+
>       <Extra TYPE="LIST">
>         </Extra>
> 
>diff --git a/src/netconfpkg/NCDevice.py b/src/netconfpkg/NCDevice.py
>index 30a61df..5f927ed 100644
>--- a/src/netconfpkg/NCDevice.py
>+++ b/src/netconfpkg/NCDevice.py
>@@ -88,6 +88,10 @@ class Device( Device_base ):
>                 'BootProto' : 'BOOTPROTO',
>                 'Type' : 'TYPE',
>                 'HardwareAddress' : 'HWADDR',
>+                'PrimaryDNS' : 'DNS1',
>+                'SecondaryDNS' : 'DNS2',
>+                'TertiaryDNS' : 'DNS3',
>+                'Searches' : 'SEARCH',
>                 }
> 
>     intkeydict = {
>@@ -279,6 +283,23 @@ class Device( Device_base ):
>                 
>         self.commit( changed=False )
> 
>+    def updateDNS( self ):
>+        # Dialup pulls DNS info from it's own database
>+        if self.Dialup:
>+            return;
>+
>+        from NCProfileList import getProfileList
>+        profilelist = getProfileList()
>+        act_prof = profilelist.getActiveProfile()
>+        if not act_prof:
>+            return
>+            
>+        if self.DeviceId in act_prof.ActiveDevices:
>+            self.PrimaryDNS = act_prof.DNS.PrimaryDNS
>+            self.SecondaryDNS = act_prof.DNS.SecondaryDNS
>+            self.TertiaryDNS = act_prof.DNS.TertiaryDNS
>+            self.Searches = " ".join(act_prof.DNS.SearchList)
>+
>     def save( self ):
>         # FIXME: [163040] "Exception Occurred" when saving
>         # fail gracefully, with informing, which file, and why
>@@ -297,6 +318,8 @@ class Device( Device_base ):
>         conf = ConfDevice( self.DeviceId )
>         conf.fsf()
> 
>+        self.updateDNS()
>+
>         if self.BootProto == None:
>             if len(self.IP):
>                 self.BootProto = "none"
>

Actions: View | Diff

Attachments on bug 446743: 305536 | 305675