From 5daf6d3aebcffeed752411d57736ace856ac264b Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 26 Mar 2013 12:18:57 +0100 Subject: [PATCH] move utils to ngcp dir --- kamailio_conf.lua | 2 +- mocks/sr.lua | 2 +- kam_utils.lua => ngcp/kam_utils.lua | 2 +- ngcp/pref.lua | 2 +- utils.lua => ngcp/utils.lua | 0 tests/kam_utils.lua | 2 +- tests/mocks.lua | 1 - tests/ngcp.lua | 2 +- tests/ngcp_dp.lua | 2 +- tests/ngcp_pp.lua | 2 +- tests/ngcp_up.lua | 2 +- tests/utils.lua | 2 +- 12 files changed, 10 insertions(+), 11 deletions(-) rename kam_utils.lua => ngcp/kam_utils.lua (98%) rename utils.lua => ngcp/utils.lua (100%) diff --git a/kamailio_conf.lua b/kamailio_conf.lua index 318979e..32e7262 100644 --- a/kamailio_conf.lua +++ b/kamailio_conf.lua @@ -1,6 +1,6 @@ #!/usr/bin/env lua5.1 -- Kamailio Lua Config -require 'kam_utils.lua' +require 'ngcp.kam_utils.lua' -- ROUTE_CLEAR_PEER_IN_PREF function clear_peer_in_pref() diff --git a/mocks/sr.lua b/mocks/sr.lua index 05c4749..6a646aa 100644 --- a/mocks/sr.lua +++ b/mocks/sr.lua @@ -1,6 +1,6 @@ #!/usr/bin/env lua5.1 require 'lemock' -require 'utils' +require 'ngcp.utils' mc = lemock.controller() diff --git a/kam_utils.lua b/ngcp/kam_utils.lua similarity index 98% rename from kam_utils.lua rename to ngcp/kam_utils.lua index b24ab6f..d8cde0a 100644 --- a/kam_utils.lua +++ b/ngcp/kam_utils.lua @@ -1,6 +1,6 @@ #!/usr/bin/env lua5.1 -- Kamailio Lua utils -require 'utils' +require 'ngcp.utils' -- kamailio log for a table function table.log(t, msg, level) diff --git a/ngcp/pref.lua b/ngcp/pref.lua index aef67fc..5db0a5e 100644 --- a/ngcp/pref.lua +++ b/ngcp/pref.lua @@ -1,5 +1,5 @@ #!/usr/bin/env lua5.1 -require 'kam_utils' +require 'ngcp.kam_utils' -- class NGCPPrefs NGCPPrefs = { diff --git a/utils.lua b/ngcp/utils.lua similarity index 100% rename from utils.lua rename to ngcp/utils.lua diff --git a/tests/kam_utils.lua b/tests/kam_utils.lua index 897c1e6..1d4336c 100644 --- a/tests/kam_utils.lua +++ b/tests/kam_utils.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'kam_utils' +require 'ngcp.kam_utils' sr = srMock:new() diff --git a/tests/mocks.lua b/tests/mocks.lua index 20b778c..27b7bee 100644 --- a/tests/mocks.lua +++ b/tests/mocks.lua @@ -1,7 +1,6 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' ---require 'utils' TestMock = {} function TestMock:testMock() diff --git a/tests/ngcp.lua b/tests/ngcp.lua index 97db3fc..70c5c36 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'utils' +require 'ngcp.utils' sr = srMock:new() diff --git a/tests/ngcp_dp.lua b/tests/ngcp_dp.lua index 35ebc89..faddfb4 100644 --- a/tests/ngcp_dp.lua +++ b/tests/ngcp_dp.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'utils' +require 'ngcp.utils' sr = srMock:new() diff --git a/tests/ngcp_pp.lua b/tests/ngcp_pp.lua index af985a3..4c77840 100644 --- a/tests/ngcp_pp.lua +++ b/tests/ngcp_pp.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'utils' +require 'ngcp.utils' sr = srMock:new() diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index ad2143a..f43bbec 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'utils' +require 'ngcp.utils' sr = srMock:new() diff --git a/tests/utils.lua b/tests/utils.lua index b205888..9d3e81b 100644 --- a/tests/utils.lua +++ b/tests/utils.lua @@ -1,7 +1,7 @@ #!/usr/bin/env lua5.1 require('luaunit') require 'mocks.sr' -require 'utils' +require 'ngcp.utils' TestUtils = {} --class