Refactor Model class

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

diff --git a/resources/tools/odltools/odltools/mdsal/models/l3vpn.py b/resources/tools/odltools/odltools/mdsal/models/l3vpn.py
index 1d6c26f17c7db576c66493618bab4d4c0117b68d..ba23c38de1cc8e73da056a5447111100f7338551 100644 (file)
--- a/resources/tools/odltools/odltools/mdsal/models/l3vpn.py
+++ b/resources/tools/odltools/odltools/mdsal/models/l3vpn.py
@@ -1,25 +1,14 @@
 from odltools.mdsal.models.model import Model
 
 
-NAME = "l3vpn"
+MODULE = "l3vpn"
 
 
 def vpn_instance_to_vpn_id(store, args):
-    return VpnInterfaces(NAME, VpnInterfaces.CONTAINER, store, args)
+    return VpnInterfaces(MODULE, store, args)
 
 
 class VpnInterfaces(Model):
     CONTAINER = "vpn-interfaces"
-    VPN_INTERFACE = "vpn-interface"
-
-    def get_vpn_interfaces(self):
-        return self.data[self.CONTAINER][self.VPN_INTERFACE]
-
-    def get_vpn_ids_by_key(self, key="name"):
-        d = {}
-        ifaces = self.get_vpn_interfaces()
-        if ifaces is None:
-            return None
-        for iface in ifaces:
-            d[iface[key]] = iface
-        return d
+    CLIST = "vpn-interface"
+    CLIST_KEY = "name"