model: remove registration and bindings

Fixes #7

1 files changed, 3 insertions, 44 deletions

diff --git a/rumba/model.py b/rumba/model.py
index 285d937..9fbda57 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -150,12 +150,10 @@ class SSHConfig:
 #
 # @difs: DIFs the node will have an IPCP in
 # @dif_registrations: Which DIF is registered in which DIF
-# @registrations: Registrations of names in DIFs
-# @bindings: Binding of names on the processing system
 #
 class Node:
     def __init__(self, name, difs=None, dif_registrations=None,
-                 registrations=None, bindings=None, client=False):
+                 client=False):
         self.name = name
         if difs is None:
             difs = list()
@@ -165,12 +163,6 @@ class Node:
         if dif_registrations is None:
             dif_registrations = dict()
         self.dif_registrations = dif_registrations
-        if registrations is None:
-            registrations = dict()
-        self.registrations = registrations
-        if bindings is None:
-            bindings = dict()
-        self.bindings = bindings
         self.ssh_config = SSHConfig(name)
         self.ipcps = []
         self.client = client
@@ -188,17 +180,13 @@ class Node:
                             "to be part of DIF %s" % (self.name, dif.name))
 
     def _validate(self):
-        # Check that DIFs referenced in self.dif_registrations and
-        # in self.registrations are part of self.difs
+        # Check that DIFs referenced in self.dif_registrations
+        # are part of self.difs
         for upper in self.dif_registrations:
             self._undeclared_dif(upper)
             for lower in self.dif_registrations[upper]:
                 self._undeclared_dif(lower)
 
-        for appl in self.registrations:
-            for dif in self.registrations[appl]:
-                self._undeclared_dif(dif)
-
     def __repr__(self):
         s = "Node " + self.name + ":\n"
 
@@ -217,19 +205,6 @@ class Node:
         s += ", ".join(rl)
         s += " ]\n"
 
-        s += "  Name registrations: [ "
-        for name in self.registrations:
-            difs = self.registrations[name]
-            s += "%s => [ " % name
-            s += ", ".join([dif.name for dif in difs])
-            s += " ]"
-        s += " ]\n"
-
-        s += "  Bindings: [ "
-        s += ", ".join(["'%s' => '%s'" % (ap, self.bindings[ap])
-                       for ap in self.bindings])
-        s += " ]\n"
-
         return s
 
     def __hash__(self):
@@ -259,22 +234,6 @@ class Node:
         self.dif_registrations[upper].remove(lower)
         self._validate()
 
-    def add_registration(self, name, dif):
-        self.dif_registrations[name].append(dif)
-        self._validate()
-
-    def del_registration(self, name, dif):
-        self.dif_registrations[name].remove(dif)
-        self._validate()
-
-    def add_binding(self, name, ap):
-        self.bindings[name] = ap
-        self._validate()
-
-    def del_binding(self, name):
-        del self.bindings[name]
-        self._validate()
-
 
 # Base class representing an IPC Process to be created in the experiment
 #