Merge branch 'master' of ssh://git.onelab.eu/git/plcapi

[plcapi.git] / PLC / Interfaces.py

diff --git a/PLC/Interfaces.py b/PLC/Interfaces.py
index 6701bef..8e5d4b6 100644 (file)
--- a/PLC/Interfaces.py
+++ b/PLC/Interfaces.py
@@ -4,8 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 from types import StringTypes
 import socket
@@ -66,6 +64,7 @@ class Interface(Row):
         'node_id': Parameter(int, "Node associated with this interface"),
         'is_primary': Parameter(bool, "Is the primary interface for this node"),
         'interface_tag_ids' : Parameter([int], "List of interface settings"),
+        'last_updated': Parameter(int, "Date and time when node entry was created", ro = True),
         }
 
     view_tags_name = "view_interface_tags"
@@ -75,13 +74,13 @@ class Interface(Row):
         network_methods = [row['method'] for row in NetworkMethods(self.api)]
         if method not in network_methods:
             raise PLCInvalidArgument, "Invalid addressing method %s"%method
-       return method
+        return method
 
     def validate_type(self, type):
         network_types = [row['type'] for row in NetworkTypes(self.api)]
         if type not in network_types:
             raise PLCInvalidArgument, "Invalid address type %s"%type
-       return type
+        return type
 
     def validate_ip(self, ip):
         if ip and not valid_ip(ip):
@@ -115,13 +114,13 @@ class Interface(Row):
     validate_dns2 = validate_ip
 
     def validate_bwlimit(self, bwlimit):
-       if not bwlimit:
-           return bwlimit
+        if not bwlimit:
+            return bwlimit
 
-       if bwlimit < 500000:
-           raise PLCInvalidArgument, 'Minimum bw is 500 kbs'
+        if bwlimit < 500000:
+            raise PLCInvalidArgument, 'Minimum bw is 500 kbs'
 
-       return bwlimit  
+        return bwlimit
 
     def validate_hostname(self, hostname):
         # Optional
@@ -185,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]:
@@ -208,6 +208,30 @@ class Interface(Row):
             if 'ip' not in self or not self['ip']:
                 raise PLCInvalidArgument, "For ipmi method, ip is required"
 
+    validate_last_updated = Row.validate_timestamp
+
+    def update_timestamp(self, col_name, commit = True):
+        """
+        Update col_name field with current time
+        """
+
+        assert 'interface_id' in self
+        assert self.table_name
+
+        self.api.db.do("UPDATE %s SET %s = CURRENT_TIMESTAMP " % (self.table_name, col_name) + \
+                       " where interface_id = %d" % (self['interface_id']) )
+        self.sync(commit)
+
+    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):
     """
     Representation of row(s) from the interfaces table in the
@@ -223,7 +247,7 @@ class Interfaces(Table):
         for tagname in self.tag_columns:
             view= "%s left join %s using (%s)"%(view,Interface.tagvalue_view_name(tagname),
                                                 Interface.primary_key)
-            
+
         sql = "SELECT %s FROM %s WHERE True" % \
             (", ".join(self.columns.keys()+self.tag_columns.keys()),view)