Use new API.

Fix tests.

ngcp/dp.lua

@@ -35,7 +35,6 @@ NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
                 table.insert(result, row)
                 row = cur:fetch({}, "a")
             end
-            sr.log("dbg",string.format("adding xavp(%s_%s)", level, 'domain'))
             self.xavp = NGCPXAvp:new(level,'domain',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))

ngcp/pp.lua

@@ -12,16 +12,15 @@ NGCPPeerPrefs_MT = { __index = NGCPPeerPrefs }
             config = config,
             db_table = "peer_preferences"
         }
-        setmetatable( t, NGCPPeerPrefs_MT )
-        return t
+        return setmetatable( t, NGCPPeerPrefs_MT )
     end
 
     function NGCPPeerPrefs:caller_load(uuid)
-        self:_load(0,uuid)
+        NGCPPeerPrefs._load(self,"caller",uuid)
     end
 
     function NGCPPeerPrefs:callee_load(uuid)
-        self:_load(1,uuid)
+        NGCPPeerPrefs._load(self,"callee",uuid)
     end
 
     function NGCPPeerPrefs:_load(level, uuid)
@@ -36,7 +35,6 @@ NGCPPeerPrefs_MT = { __index = NGCPPeerPrefs }
                 table.insert(result, row)
                 row = cur:fetch({}, "a")
             end
-            sr.log("dbg",string.format("adding xavp %s[%d]", 'domain', level))
             self.xavp = NGCPXAvp:new(level,'domain',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))

tests/ngcp_pp.lua

@@ -73,10 +73,10 @@ TestNGCPPeerPrefs = {} --class
 
         assertTrue(self.d.xavp)
         assertEquals(self.d.xavp("sst_enable"),"no")
-        assertEquals(sr.pv.vars["$xavp(domain[0]=>dummy)"], "")
-        assertEquals(self.d.xavp("dummy"),"")
-        assertEquals(sr.pv.vars["$xavp(domain[0]=>sst_enable)"],"no")
-        assertEquals(sr.pv.vars["$xavp(domain[0]=>sst_refresh_method)"], "UPDATE_FALLBACK_INVITE")
+        assertEquals(sr.pv.get("$xavp(domain[0]=>dummy)"), "caller")
+        assertEquals(self.d.xavp("dummy"),"caller")
+        assertEquals(sr.pv.get("$xavp(domain[0]=>sst_enable)"),"no")
+        assertEquals(sr.pv.get("$xavp(domain[0]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE")
         assertIsNil(self.d.xavp("error_key"))
     end
 
@@ -97,9 +97,9 @@ TestNGCPPeerPrefs = {} --class
         assertTrue(self.d.xavp)
         assertEquals(self.d.xavp("sst_enable"),"no")
         --print(table.tostring(sr.pv.vars))
-        assertFalse(sr.pv.vars["$xavp(domain[1]=>dummy)"])
-        assertEquals(sr.pv.vars["$xavp(domain[1]=>sst_enable)"],"no")
-        assertEquals(sr.pv.vars["$xavp(domain[1]=>sst_refresh_method)"], "UPDATE_FALLBACK_INVITE")
+        assertEquals(sr.pv.get("$xavp(domain[1]=>dummy)"), "callee")
+        assertEquals(sr.pv.get("$xavp(domain[1]=>sst_enable)"),"no")
+        assertEquals(sr.pv.get("$xavp(domain[1]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE")
         assertIsNil(self.d.xavp("error_key"))
     end
 -- class TestNGCPPeerPrefs