Refactor Model class

[netvirt.git] / resources / tools / odltools / odltools / mdsal / models / ietf_interfaces.py

diff --git a/resources/tools/odltools/odltools/mdsal/models/ietf_interfaces.py b/resources/tools/odltools/odltools/mdsal/models/ietf_interfaces.py
index d96b3ec8c12eb39b851f913a5936d674af7b5e6c..6886806bb5e6165732f44c09cc887d4692fda411 100644 (file)
--- a/resources/tools/odltools/odltools/mdsal/models/ietf_interfaces.py
+++ b/resources/tools/odltools/odltools/mdsal/models/ietf_interfaces.py
@@ -1,47 +1,24 @@
 from odltools.mdsal.models.model import Model
 
 
-NAME = "ietf-interfaces"
+MODULE = "ietf-interfaces"
 
 
 def interfaces(store, args):
-    return Interfaces(NAME, Interfaces.CONTAINER, store, args)
+    return Interfaces(MODULE, store, args)
 
 
 def interfaces_state(store, args):
-    return InterfacesState(NAME, InterfacesState.CONTAINER, store, args)
+    return InterfacesState(MODULE, store, args)
 
 
 class Interfaces(Model):
     CONTAINER = "interfaces"
-    INTERFACE = "interface"
-
-    def get_interfaces(self):
-        return self.data and self.data[self.CONTAINER][self.INTERFACE]
-
-    def get_interfaces_by_key(self, key="name"):
-        d = {}
-        ifaces = self.get_interfaces()
-        if ifaces is None:
-            return None
-        for iface in ifaces:
-            d[iface[key]] = iface
-        return d
+    CLIST = "interface"
+    CLIST_KEY = "name"
 
 
 class InterfacesState(Model):
-    ROOT = NAME
     CONTAINER = "interfaces-state"
-    INTERFACE = "interface"
-
-    def get_interfaces(self):
-        return self.data[self.CONTAINER][self.INTERFACE]
-
-    def get_interfaces_by_key(self, key="name"):
-        d = {}
-        ifaces = self.get_interfaces()
-        if ifaces is None:
-            return None
-        for iface in ifaces:
-            d[iface[key]] = iface
-        return d
+    CLIST = "interface"
+    CLIST_KEY = "name"