Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi

[plcapi.git] / PLC / Interfaces.py

diff --git a/PLC/Interfaces.py b/PLC/Interfaces.py
index 2ea645f..8e5d4b6 100644 (file)
--- a/PLC/Interfaces.py
+++ b/PLC/Interfaces.py
@@ -4,9 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 from types import StringTypes
 import socket
@@ -187,10 +184,11 @@ class Interface(Row):
             # DHCP!
 
         elif method == "static":
-            if 'is_primary' in self and self['is_primary'] is True:
-                for key in ['gateway', 'dns1']:
-                    if key not in self or not self[key]:
+            for key in ['gateway', 'dns1']:
+                if key not in self or not self[key]:
+                   if 'is_primary' in self and self['is_primary'] is True:
                         raise PLCInvalidArgument, "For static method primary network, %s is required" % key
+                else:
                     globals()[key] = self[key]
             for key in ['ip', 'network', 'broadcast', 'netmask']:
                 if key not in self or not self[key]:
@@ -227,6 +225,12 @@ class Interface(Row):
     def update_last_updated(self, commit = True):
         self.update_timestamp('last_updated', commit)
 
+    def delete(self,commit=True):
+        ### need to cleanup ilinks
+        self.api.db.do("DELETE FROM ilink WHERE src_interface_id=%d OR dst_interface_id=%d" % \
+                           (self['interface_id'],self['interface_id']))
+        
+        Row.delete(self)
 
 class Interfaces(Table):
     """