Using new API.

Fix dp tests.

ngcp/dp.lua

@@ -16,11 +16,11 @@ NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
     end
 
     function NGCPDomainPrefs:caller_load(uuid)
-        NGCPDomainPrefs._load(self,0,uuid)
+        NGCPDomainPrefs._load(self,"caller",uuid)
     end
 
     function NGCPDomainPrefs:callee_load(uuid)
-        NGCPDomainPrefs._load(self,1,uuid)
+        NGCPDomainPrefs._load(self,"callee",uuid)
     end
 
     function NGCPDomainPrefs:_load(level, uuid)
@@ -28,14 +28,14 @@ NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
         local query = "SELECT * FROM " .. self.db_table .. " WHERE domain ='" .. uuid .."'"
         local cur = assert (con:execute(query))
         local result = {}
-        local row = cur:fetch(result, "a")
+        local row = cur:fetch({}, "a")
         if row then
             while row do
-                sr.log("info", string.format("result:%s row:%s", table.tostring(result), table.tostring(row)))
+                --sr.log("info", string.format("result:%s row:%s", table.tostring(result), table.tostring(row)))
                 table.insert(result, row)
                 row = cur:fetch({}, "a")
             end
-            sr.log("dbg",string.format("adding xavp %s[%d]", 'domain', level))
+            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))

tests/ngcp_dp.lua

@@ -73,10 +73,8 @@ TestNGCPDomainPrefs = {} --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]=>sst_enable)"),"no")
+        assertEquals(sr.pv.get("$xavp(domain[0]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE")
         assertIsNil(self.d.xavp("error_key"))
     end
 
@@ -96,10 +94,8 @@ TestNGCPDomainPrefs = {} --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]=>sst_enable)"),"no")
+        assertEquals(sr.pv.get("$xavp(domain[1]=>sst_refresh_method)"), "UPDATE_FALLBACK_INVITE")
         assertIsNil(self.d.xavp("error_key"))
     end
 -- class TestNGCPDomainPrefs