# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1329172042 -3600
# Node ID fbd7364b252d8f2f33e3e442c105724b133066a2
# Parent  e045e628a519dc57bfd78eecdc28e6b773fa1d02
implementing Provider.loadConig started

diff -r e045e628a519 -r fbd7364b252d iro/offer/offer.py
--- a/iro/offer/offer.py	Mon Feb 13 22:20:36 2012 +0100
+++ b/iro/offer/offer.py	Mon Feb 13 23:27:22 2012 +0100
@@ -5,6 +5,7 @@
         self.name = name
         self.route = route
         self.provider = provider
+        self.typ = typ
 
     def send(self, recipient, message):
         return Status(self.name, Status.error, errtext="Error: Test")
diff -r e045e628a519 -r fbd7364b252d iro/offer/provider.py
--- a/iro/offer/provider.py	Mon Feb 13 22:20:36 2012 +0100
+++ b/iro/offer/provider.py	Mon Feb 13 23:27:22 2012 +0100
@@ -6,4 +6,6 @@
         self.loadConfig()
 
     def loadConfig(self):
-        pass
+        for (n, v) in self.config:
+            if n == "typ":
+                self.typ = v
diff -r e045e628a519 -r fbd7364b252d tests/job.py
--- a/tests/job.py	Mon Feb 13 22:20:36 2012 +0100
+++ b/tests/job.py	Mon Feb 13 23:27:22 2012 +0100
@@ -6,7 +6,8 @@
 from iro.controller.task import createJob, Task
 from iro.controller.pool  import taskPool, dbPool
 
-from iro.model.job import exJobs, ExJob, Status
+from iro.model.job import exJobs, ExJob
+from iro.model.status import Status
 from iro.model.offer import offers
 from iro.model.pool import data
 
@@ -132,7 +133,7 @@
             o=DBOffer(name="test", provider="bla", route="basic", typ="sms")
             u.rights.append(Userright(o)) 
         
-        offers["test"] = Offer("test")
+        offers["test"] = Offer("test",provider=None, route=None, typ="sms")
 
         exjob = yield exJobs.create(u, [Telnumber('123456789')], SMS('test'), ['test'])
         
diff -r e045e628a519 -r fbd7364b252d tests/offer.py
--- a/tests/offer.py	Mon Feb 13 22:20:36 2012 +0100
+++ b/tests/offer.py	Mon Feb 13 23:27:22 2012 +0100
@@ -67,7 +67,7 @@
             o=DBOffer(name="oh", provider="bla", route="a", typ="sms")
             u.rights.append(Userright(o)) 
         
-        offer.providers={"bla":Provider("bla",None, ["a","b","c"])}
+        offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
 
         for l in [['bla'],['oh'],['oh','bla'],['bla','oh']]:
             ret = yield offer.extendProvider(u, "sms", l)
@@ -84,7 +84,7 @@
             o=DBOffer(name="a", provider="bla", route="b", typ="sms")
             u.rights.append(Userright(o)) 
         
-        offer.providers={"bla":Provider("bla", None, ["a","b","c"])}
+        offer.providers={"bla":Provider("bla", [], ["a","b","c"])}
 
         ret = yield offer.extendProvider(u, "sms",  ["bla"])
         self.assertEqual(ret, ["oh","a"])