Refactor Model class

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

diff --git a/resources/tools/odltools/odltools/mdsal/models/network_topology.py b/resources/tools/odltools/odltools/mdsal/models/network_topology.py
index d12ffd552e164906070ee463127cfcb10d98ba28..d83ed595d19ee848a96f77abc2f826f068d5a1d4 100644 (file)
--- a/resources/tools/odltools/odltools/mdsal/models/network_topology.py
+++ b/resources/tools/odltools/odltools/mdsal/models/network_topology.py
@@ -1,11 +1,11 @@
 from odltools.mdsal.models.model import Model
 
 
-NAME = "network-topology"
+MODULE = "network-topology"
 
 
 def network_topology(store, args, mid="ovsdb:1"):
-    return NetworkTopology(NAME, NetworkTopology.CONTAINER, store, args, mid)
+    return NetworkTopology(MODULE, store, args, mid)
 
 
 class NetworkTopology(Model):
@@ -15,26 +15,23 @@ class NetworkTopology(Model):
     NODE = "node"
     OVSDB1 = "ovsdb:1"
 
-    def get_topologies(self):
+    def get_clist(self):
         return self.data[self.TOPOLOGY]
 
     def get_topology_by_tid(self, tid="ovsdb:1"):
-        topologies = self.get_topologies()
-        if topologies is None:
-            return None
+        topologies = self.get_clist()
         for topology in topologies:
             if topology['topology-id'] == tid:
                 return topology
+        return {}
 
     def get_nodes_by_tid(self, tid="ovsdb:1"):
         topology = self.get_topology_by_tid(tid)
-        return topology[self.NODE]
+        return topology.get(self.NODE, [])
 
     def get_nodes_by_tid_and_key(self, tid="ovsdb:1", key='node-id'):
         d = {}
         nodes = self.get_nodes_by_tid(tid)
-        if nodes is None:
-            return None
         for node in nodes:
             d[node[key]] = node
         return d