cwmp 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjYyNWVmZDgwODQ1OTA1MGUyMjhlZjRkOGJmODdiNjVmZDc0OTZmYQ==
+    N2ExN2IwZDNhYzA4ZGQ3YWNlNzU2NzY4YTAxZWU1OTVkYzY3Y2IxYQ==
   data.tar.gz: !binary |-
-    YTJhMTlmNjU3M2EzZmVmMmNiY2Q4ZGM4MTEwOTIyZjkzMzRhYWFmOQ==
+    YmFlYzhkN2E5MjY4ZmQ0OWQ5N2I0YjMzMTIxYWRjZWZlZjQyYzkwYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjU0Y2RiY2NmNzhkZTFmYmM2MGYzYThhYzNjYTA5ZDA3MjBkY2QzOTE1MDU5
-    ZDQ1MmI1MTFhMTQxMmIyNzNiMjQ3NDYyMWI2ODI0ZmI0NDdjZmIwZGMxNzg0
-    OGMxNzdiY2QxMzMwMmY2YWFhY2U4ZjRlYjUzYWQ3NTNkNGMzNDg=
+    NDA5ZjJmZDkyNDQ2OTMwYWIwODA4M2JmMjljN2MwMzMyZjY0YzVkYTI5NjEx
+    NDM5MmRkMzQ3NTdjNjQwNTU5NWNiM2VlYWUzNDA4ZjMzMzZmMzA3YTAwNjZh
+    OWNjMmEzNGM5M2FlMWQ4YWI4N2JhNDIyNGNmYmQ2ZGNjNjAxMmU=
   data.tar.gz: !binary |-
-    MzgyZDhiYWM5ZmQ4YmFhZWY4YWEzYWI0NzgyNzIxMmVkODU3NjFjMWIwMmQx
-    MmEzZGI0ZjMxZTQ2YzkyYjM3ODM3MTEzZTZiMzRhNmQ0NTBjMjE5ZTFlNDlj
-    ZDI5MGY4YjIyNDJmZDBlZGU1NGYyNjhjNzJkY2VkZmUxMWRlNTc=
+    MmU2ZDVhZTI2ZDA4MWFiNTNiNDIwNmU3ZmZlODI4ZmViZjNhYzFjMGNlMWIz
+    NzVlZGFiNjU3YTY3ZDI0M2Q3ZjQxNWRjYmRkYjdmYWI2YTIwNmQzMDMzNTY0
+    N2UwNzA4MmIyNzUzNzhjZGEwN2IwYzk3M2E0YmZlMzNkMGU3ZDE=

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -7,6 +7,7 @@ A ruby library for parsing and crafting CWMP messages. Includes an ACS server an
 ```ruby
 require 'cwmp'
 
+puts Cwmp::Message::inform "Moonar", "130978", "00001", "1 BOOT", "0.0.1"
 puts Cwmp::Message::inform_response
 puts Cwmp::Message::get_parameter_values ["Device.ManagementServer.", "Device.Time."]
 puts Cwmp::Message::set_parameter_values [["InternetGatewayDevice.Services.VoiceService.1.VoiceProfile.1.Enable", "Enabled"], ["InternetGatewayDevice.LANDevice.1.LANHostConfigManagement.DHCPStaticAddress.1.Enable", "true"]]

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/bin/acs

@@ -11,5 +11,5 @@ o.on('-v', '--version', 'Version') { puts "acs v#{Cwmp::VERSION}"; exit }
 o.parse!
 
 port = options['port'] || 9321
-Cwmp::Acs.new(port).start
+Cwmp::Acs.instance.start(port)
 

data/bin/cpe

@@ -11,7 +11,7 @@ o.on('-h', '--help', 'Server port') { puts o; exit }
 o.on('-v', '--version', 'Version') { puts "cpe v#{Cwmp::VERSION}"; exit }
 o.parse!
 
-url = options['url'] || 'http://localhost:9292/acs'
+url = options['url'] || 'http://localhost:9321/acs'
 periodic_interval = options['periodic'] || 0
 
 cpe = Cwmp::Cpe.new url, periodic_interval, {:serial => "A54FD"}

data/cwmp.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |spec|
     spec.add_dependency('thin', '~> 1.6', '>= 1.6.2')
     spec.add_dependency('http_router', '~> 0.11', '>= 0.11.1')
     spec.add_dependency('httpclient', '~> 2.4', '>= 2.4.0')
-end
+    spec.add_dependency('rake', '~> 0.9', '>= 0.9.2')
+end

data/examples/api_usage.rb

@@ -0,0 +1,9 @@
+
+
+acs = Cwmp::Acs.instance
+puts acs.cpes
+acs.GetParameterValues "A54FD", "ciao."
+
+acs.start_session "A54FD" do |cpe|
+
+end

data/lib/cwmp/acs.rb

@@ -5,17 +5,34 @@ require 'http_router'
 require 'nokogiri'
 require 'readline'
 require 'digest'
+require 'singleton'
 
 Thread::abort_on_exception = true
 
 module Cwmp
 
+    class CpeSession
+        def initialize
+
+        end
+    end
+
+    class Request
+        attr_accessor :message, :cb
+        def initialize message, &block
+            @message = message
+            @cb = block
+        end
+    end
+
     class AcsCpe
-        attr_accessor :serial, :conn_req, :queue, :session_cookie
+        attr_accessor :serial, :conn_req, :queue, :session_cookie, :req_currently_in_service, :session
 
         def initialize serial
             @serial = serial
             @queue = Queue.new
+            @req_currently_in_service = nil
+            @session = nil
         end
 
         def do_connection_request
@@ -34,70 +51,81 @@ module Cwmp
             req = Rack::Request.new(env)
             len = req.content_length.to_i
 
-            if len == 0
-                message_type = ''
-            else
-                body = req.body.read
-                doc = Nokogiri::XML(body)
-                body =~ /(\w+):Envelope/
-                soap_ns = $1
-                message_type = doc.css("#{soap_ns}|Body")[0].element_children[0].name
-            end
-
-            if message_type == "Inform"
-                manufacturer = doc.css("Manufacturer").text
-                oui = doc.css("OUI").text
-                serial_number = doc.css("SerialNumber").text
-                event_codes = doc.css("EventCode").map { |n| n.text }
-                parameters = {}
-                doc.css("ParameterValueStruct").map { |it| parameters[it.element_children[0].text] = it.element_children[1].text }
-
-                ck = Digest::MD5.hexdigest("#{serial_number}#{Time.new.to_i}")
-
-                if !@acs.cpes.has_key? serial_number
-                    cpe = AcsCpe.new serial_number
-                    cpe.conn_req = parameters['InternetGatewayDevice.ManagementServer.ConnectionRequestURL']
-                    cpe.session_cookie = ck
-                    @acs.cpes[serial_number] = cpe
-                end
-                puts "got Inform from #{req.ip}:#{req.port} [sn #{serial_number}] with eventcodes #{event_codes.join(", ")}"
-
-                inform_response = Cwmp::Message::inform_response
-                response = Rack::Response.new inform_response, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
-                response.set_cookie("sessiontrack", {:value => ck, :path => "/", :expires => Time.now+24*60*60})
-                response.finish
-            elsif message_type == "TransferComplete"
-                puts "got TransferComplete"
-            else
+            begin
                 if len == 0
-                    puts "got Empty Post"
+                    message_type = ''
                 else
-                    puts "got #{message_type}"
-                    case message_type
-                        when "GetParameterValuesResponse"
-                            doc.css("ParameterValueStruct").each do |node|
-                                puts "#{node.element_children[0].text}: #{node.element_children[1].text}"
-                            end
-                        when "Fault"
-                            puts "#{doc.css("faultstring").text}: #{doc.css("FaultString").text}"
-                    end
+                    body = req.body.read
+                    mess = Cwmp::Message::parse_from_text body
+                    message_type = mess.message_type
                 end
 
-                cookie = req.cookies['sessiontrack']
-                @acs.cpes.each do |k,c|
-                    cpe = c if c.session_cookie = cookie
-                end
+                if message_type == "Inform"
+                    doc = mess.parsed_xml_doc
+                    manufacturer = doc.css("Manufacturer").text
+                    oui = doc.css("OUI").text
+                    serial_number = doc.css("SerialNumber").text
+                    event_codes = doc.css("EventCode").map { |n| n.text }
+                    parameters = {}
+                    doc.css("ParameterValueStruct").map { |it| parameters[it.element_children[0].text] = it.element_children[1].text }
+
+                    ck = Digest::MD5.hexdigest("#{serial_number}#{Time.new.to_i}")
+
+                    if !@acs.cpes.has_key? serial_number
+                        cpe = AcsCpe.new serial_number
+                        cpe.conn_req = parameters['InternetGatewayDevice.ManagementServer.ConnectionRequestURL']
+                        cpe.session_cookie = ck
+                        @acs.cpes[serial_number] = cpe
+                    end
+                    puts "got Inform from #{req.ip}:#{req.port} [sn #{serial_number}] with eventcodes #{event_codes.join(", ")}"
 
-                # Got Empty Post or a Response. Now check for any event to send, otherwise 204
-                if cpe.queue.size > 0
-                    m = cpe.queue.pop
-                    response = Rack::Response.new m, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
+                    inform_response = Cwmp::Message::inform_response
+                    response = Rack::Response.new inform_response.xml, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
+                    response.set_cookie("sessiontrack", {:value => ck, :path => "/", :expires => Time.now+24*60*60})
                     response.finish
+                elsif message_type == "TransferComplete"
+                    puts "got TransferComplete"
                 else
-                    puts "sending 204"
-                    [204, {"Connection" => "Close", 'Server' => 'ruby-cwmp'}, ""]
-                end
+                    cookie = req.cookies['sessiontrack']
+                    @acs.cpes.each do |k,c|
+                        cpe = c if c.session_cookie = cookie
+                    end
 
+                    if len == 0
+                        puts "got Empty Post"
+                    else
+                        puts "got #{message_type}"
+                        doc = mess.parsed_xml_doc
+                        case message_type
+                            when "GetParameterValuesResponse"
+                                doc.css("ParameterValueStruct").each do |node|
+                                    puts "#{node.element_children[0].text}: #{node.element_children[1].text}"
+                                end
+                            when "Fault"
+                                puts "#{doc.css("faultstring").text}: #{doc.css("FaultString").text}"
+                        end
+
+                        if cpe.req_currently_in_service != nil
+                            cpe.req_currently_in_service.cb.call(mess)
+                        end
+                    end
+
+
+                    # Got Empty Post or a Response. Now check for any event to send, otherwise 204
+                    if cpe.queue.size > 0
+                        m = cpe.queue.pop
+                        cpe.req_currently_in_service = m
+                        response = Rack::Response.new m.message, 200, {'Connection' => 'Keep-Alive', 'Server' => 'ruby-cwmp'}
+                        response.finish
+                    else
+                        puts "sending 204"
+                        [204, {"Connection" => "Close", 'Server' => 'ruby-cwmp'}, ""]
+                    end
+                end
+            rescue Exception => e
+                puts e
+                puts e.backtrace
+                raise e
             end
         end
 
@@ -105,11 +133,13 @@ module Cwmp
 
 
     class Acs
+        include Singleton
+
         attr_accessor :cpes
 
-        def initialize (port)
+        def initialize
             ac = self
-            @port = port
+
             # @handler = Handler.new
             @app = HttpRouter.new do
                 # add('/api').to(SocketApp.new)
@@ -121,7 +151,7 @@ module Cwmp
         def start_cli
             list = [
                 'GetParameterValues', 'SetParameterValues', 'Reboot', 'FactoryReset', 'Download', 'AddObject', 'DeleteObject',
-                'help', 'quit', "waitMessage"
+                'help', 'list', 'quit', "waitMessage"
             ].sort
 
             comp = proc { |s| list.grep(/^#{Regexp.escape(s)}/) }
@@ -131,35 +161,74 @@ module Cwmp
 
             while line = ::Readline.readline('> ', true)
                 case line
-                    when "quit"
+                    when "quit", "exit"
                         puts "Bye"
                         exit(0)
                     when "help"
-                        help
+                        puts "help not available"
+                    when "list games"
+                        puts ["FALKEN'S MAZE", "BLACK JACK", "GIN RUMMY", "HEARTS", "BRIDGE", "CHECKERS", "CHESS", "POKER", "FIGHTER COMBAT", "GUERRILLA ENGAGEMENT", "DESERT WARFARE" "AIR-TO-GROUND ACTIONS", "THEATERWIDE TACTICAL WARFARE", "THEATERWIDE BIOTOXIC AND CHEMICAL WARFARE", "GLOBAL THERMONUCLEAR WAR"].join "\n"
+                    when "help games"
+                        puts "Games refers to models, simulations and games which have strategic applications"
                     when "list"
                         p @cpes
-                    when /^get (\w+) (.+)/
-                        cpe = @cpes[$1]
-                        cpe.queue << Cwmp::Message::get_parameter_values($2)
-                        cpe.do_connection_request
-                    when /reboot (\w+)/
-                        cpe = @cpes[$1]
-                        cpe.queue << Cwmp::Message::reboot
+                    when /send (\w+) (\w+) (.+)/
+                        message_type = $1
+                        serial = $2
+                        args = $3.split(" ")
+
+                        # allowed_messages = ["GetParameterValues", "GetParameterNames", "SetParameterValues", "AddObject", "DeleteObject", "Reboot", "FactoryReset"]
+                        # if !allowed_messages.include? message_type
+                        #     puts "cmd #{message_type} unknown"
+                        #     next
+                        # end
+
+                        cpe = @cpes[serial]
+                        if !cpe
+                            puts "cpe #{serial} unknown"
+                            next
+                        end
+
+                        mess = Object.const_get("Cwmp").const_get("Message").send(message_type, args)
+                        cpe.queue << Cwmp::Request.new(mess) do |resp|
+                            puts "arrived #{resp}"
+                        end
                         cpe.do_connection_request
+                    when "run"
+                        begin
+                            require './examples/api_usage'
+                        rescue LoadError
+                            puts "file not found"
+                        rescue SyntaxError => e
+                            puts "file contains syntax errors: #{e.message}"
+                        rescue Exception => e
+                            puts "runtime error: #{e.message}"
+                        end
+                    else
+                        puts "unknown command <#{line}>" if line != ""
                 end
             end
         end
 
-        def start
+        def start port
+            trap("SIGINT") { puts "Bye"; exit! }
+            @port = port
             puts "ACS #{Cwmp::VERSION} by Luca Cervasio <luca.cervasio@gmail.com>"
             puts "Daemon running on http://localhost:#{@port}/acs"
-            @web = Thread.new do
-                Thin::Logging.silent = true
-                Rack::Handler::Thin.run @app, :Port => @port
+
+            Thread.new do
+                start_cli
             end
 
-            start_cli
+            Thin::Logging.silent = true
+            Rack::Handler::Thin.run @app, :Port => @port
+
         end
+
+        def start_session(serial, &block)
+
+        end
+
     end
 
 end

data/lib/cwmp/cpe.rb

@@ -84,7 +84,7 @@ module Cwmp
                 c = HTTPClient.new
 
                 puts "sending Inform with event #{event}"
-                resp = c.post @acs_url, Cwmp::Message::inform(@manufacturer, @oui, @serial, event, @software_version), {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                resp = c.post @acs_url, Cwmp::Message::inform(@manufacturer, @oui, @serial, event, @software_version).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                 doc = Nokogiri::XML(resp.body)
                 resp.body =~ /(\w+):Envelope/
                 soap_ns = $1
@@ -97,11 +97,11 @@ module Cwmp
                     puts "got #{message_type}"
                     case message_type
                         when "GetParameterValues"
-                            resp = c.post @acs_url, Cwmp::Message::get_parameter_values_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                            resp = c.post @acs_url, (Cwmp::Message::get_parameter_values_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                         when "GetParameterNames"
-                            resp = c.post @acs_url, Cwmp::Message::get_parameter_names_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                            resp = c.post @acs_url, (Cwmp::Message::get_parameter_names_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                         when "SetParameterValues"
-                            resp = c.post @acs_url, Cwmp::Message::set_parameter_values_response, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                            resp = c.post @acs_url, (Cwmp::Message::set_parameter_values_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                     end
                 end
                 puts "got #{resp.status}, closing"

data/lib/cwmp/message.rb

@@ -2,10 +2,77 @@ require 'nokogiri'
 
 module Cwmp
     class Message
+
         NAMESPACES = {"xmlns:soap" => "http://schemas.xmlsoap.org/soap/envelope/", "xmlns:soap-enc" => "http://schemas.xmlsoap.org/soap/encoding/", "xmlns:cwmp" => "urn:dslforum-org:cwmp-1-0", "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance", "xml:xsd" => "http://www.w3.org/2001/XMLSchema", "xmlns" => "urn:dslforum-org:cwmp-1-0"}
+        attr_accessor :message_type, :raw_xml_message, :parsed_xml_doc
+
+        def self.parse_from_text txtmsg
+            doc = Nokogiri::XML(txtmsg)
+            txtmsg =~ /(\w+):Envelope/
+            soap_ns = $1
+            message_type = doc.css("#{soap_ns}|Body")[0].element_children[0].name
+
+            m = Cwmp::Message.new
+            m.message_type = message_type
+            m.parsed_xml_doc = doc
+            m.raw_xml_message = txtmsg
+            return m
+        end
+
+
+        def to_s
+            return "CWMP Mess #{@message_type}"
+        end
+
+        def xml
+            return @raw_xml_message
+        end
+
+        def supported_model
+            if @raw_xml_message =~ /InternetGatewayDevice/
+                return 'TR-098'
+            else
+                return 'TR-181'
+            end
+        end
+
+        def self.reboot
+            m = Cwmp::Message.new
+            m.message_type = "Reboot"
+            b = Nokogiri::XML::Builder.new
+
+            b[:soap].Envelope(NAMESPACES) {
+                b[:soap].Header {}
+                b[:soap].Body {
+                    b[:cwmp].Reboot() {}
+                }
+            }
+
+            m.raw_xml_message = b.to_xml
+            return m
+        end
+
+        def self.reboot_response
+            m = Cwmp::Message.new
+            m.message_type = "RebootResponse"
+            b = Nokogiri::XML::Builder.new
+
+            b[:soap].Envelope(NAMESPACES) {
+                b[:soap].Header {}
+                b[:soap].Body {
+                    b[:cwmp].RebootResponse() {}
+                }
+            }
+
+            m.raw_xml_message = b.to_xml
+            return m
+        end
 
         def self.inform(manufacturer, oui, serial, eventcodes, software_version)
-            return '<?xml version="1.0" encoding="UTF-8"?>
+            m = Cwmp::Message.new
+
+            m.message_type = "Inform"
+            m.raw_xml_message = '<?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -61,50 +128,52 @@ module Cwmp
         </cwmp:Inform>
     </soap:Body>
 </soap:Envelope>'
+
+            return m
         end
 
         def self.inform_response
-            b = Nokogiri::XML::Builder.new
-
-            b[:soap].Envelope(NAMESPACES) {
-                b[:soap].Header {}
-                b[:soap].Body {
-                    b[:cwmp].InformResponse() {}
-                }
-            }
+            m = Cwmp::Message.new
 
-            return b.to_xml
-        end
+            m.message_type = "InformResponse"
 
-        def self.reboot
             b = Nokogiri::XML::Builder.new
 
             b[:soap].Envelope(NAMESPACES) {
                 b[:soap].Header {}
                 b[:soap].Body {
-                    b[:cwmp].Reboot() {}
+                    b[:cwmp].InformResponse() {}
                 }
             }
 
-            return b.to_xml
+            m.raw_xml_message = b.to_xml
+
+            return m
         end
 
-        def self.get_parameter_values (leaves)
+        def self.set_parameter_values(leaves)
             b = Nokogiri::XML::Builder.new
 
             b[:soap].Envelope(NAMESPACES) {
                 b[:soap].Header {}
                 b[:soap].Body {
 
-                    b[:cwmp].GetParameterValues() {
-                        b.ParameterNames({"soap-enc:arrayType" => "cwmp:string[#{leaves.kind_of?(Array) ? leaves.size : '1'}]"}) {
-                            if leaves.kind_of?(Array)
+                    b[:cwmp].SetParameterValues() {
+                        b.ParameterList({"soap-enc:arrayType" => "cwmp:ParameterValueStruct[#{leaves[0].kind_of?(Array) ? leaves.size : '1'}]"}) {
+                            if leaves[0].kind_of?(Array)
                                 leaves.each do |leaf|
-                                    b.string leaf
+                                    b.ParameterValueStruct {
+                                        b.Name leaf[0]
+                                        b.Value leaf[1]
+                                    }
                                 end
                             else
-                                b.string leaves
+                                b.ParameterValueStruct {
+                                    b.Name leaves[0]
+                                    b.Value leaves[1]
+                                }
                             end
+                            b.ParameterKey "asdads"
                         }
                     }
                 }
@@ -113,68 +182,22 @@ module Cwmp
             return b.to_xml
         end
 
-        def self.get_parameter_values_response
-            return '<soap:Envelope
-	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
-	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<soap:Header>
-	<cwmp:ID soap:mustUnderstand="1"></cwmp:ID>
-</soap:Header>
-<soap:Body>
-<cwmp:GetParameterValuesResponse>
-<ParameterList soap-enc:arrayType="cwmp:ParameterValueStruct[5]">
-<ParameterValueStruct>
-	<Name>InternetGatewayDevice.Time.NTPServer1</Name>
-	<Value xsi:type="xsd:string">pool.ntp.org</Value>
-</ParameterValueStruct>
-<ParameterValueStruct>
-	<Name>InternetGatewayDevice.Time.CurrentLocalTime</Name>
-	<Value xsi:type="xsd:dateTime">2014-07-11T09:08:25</Value>
-</ParameterValueStruct>
-<ParameterValueStruct>
-	<Name>InternetGatewayDevice.Time.LocalTimeZone</Name>
-	<Value xsi:type="xsd:string">+00:00</Value>
-</ParameterValueStruct>
-<ParameterValueStruct>
-	<Name>InternetGatewayDevice.Time.LocalTimeZoneName</Name>
-	<Value xsi:type="xsd:string">Greenwich Mean Time : Dublin</Value>
-</ParameterValueStruct>
-<ParameterValueStruct>
-	<Name>InternetGatewayDevice.Time.DaylightSavingsUsed</Name>
-	<Value xsi:type="xsd:boolean">0</Value>
-</ParameterValueStruct>
-</ParameterList>
-</cwmp:GetParameterValuesResponse>
-</soap:Body>
-</soap:Envelope>'
-        end
-
-        def self.set_parameter_values (leaves)
+        def self.get_parameter_values(leaves)
             b = Nokogiri::XML::Builder.new
 
             b[:soap].Envelope(NAMESPACES) {
                 b[:soap].Header {}
                 b[:soap].Body {
 
-                    b[:cwmp].SetParameterValues() {
-                        b.ParameterList({"soap-enc:arrayType" => "cwmp:ParameterValueStruct[#{leaves[0].kind_of?(Array) ? leaves.size : '1'}]"}) {
-                            if leaves[0].kind_of?(Array)
+                    b[:cwmp].GetParameterValues() {
+                        b.ParameterNames({"soap-enc:arrayType" => "cwmp:string[#{leaves.kind_of?(Array) ? leaves.size : '1'}]"}) {
+                            if leaves.kind_of?(Array)
                                 leaves.each do |leaf|
-                                    b.ParameterValueStruct {
-                                        b.Name leaf[0]
-                                        b.Value leaf[1]
-                                    }
+                                    b.string leaf
                                 end
                             else
-                                b.ParameterValueStruct {
-                                    b.Name leaves[0]
-                                    b.Value leaves[1]
-                                }
+                                b.string leaves
                             end
-                            b.ParameterKey "asdads"
                         }
                     }
                 }
@@ -183,13 +206,11 @@ module Cwmp
             return b.to_xml
         end
 
-
-        def self.set_parameter_values_response
-            return ''
-        end
-
         def self.get_parameter_names_response
-            return '<soap:Envelope
+            m = Cwmp::Message.new
+
+            m.message_type = "Inform"
+            m.raw_xml_message = '<soap:Envelope
 	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
 	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
 	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
@@ -273,6 +294,53 @@ module Cwmp
 </cwmp:GetParameterNamesResponse>
 </soap:Body>
 </soap:Envelope>'
+
+            return m
+        end
+
+        def self.get_parameter_values_response
+            m = Cwmp::Message.new
+
+            m.message_type = "Inform"
+            m.raw_xml_message = '<soap:Envelope
+	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
+	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<soap:Header>
+	<cwmp:ID soap:mustUnderstand="1"></cwmp:ID>
+</soap:Header>
+<soap:Body>
+<cwmp:GetParameterValuesResponse>
+<ParameterList soap-enc:arrayType="cwmp:ParameterValueStruct[5]">
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.NTPServer1</Name>
+	<Value xsi:type="xsd:string">pool.ntp.org</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.CurrentLocalTime</Name>
+	<Value xsi:type="xsd:dateTime">2014-07-11T09:08:25</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.LocalTimeZone</Name>
+	<Value xsi:type="xsd:string">+00:00</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.LocalTimeZoneName</Name>
+	<Value xsi:type="xsd:string">Greenwich Mean Time : Dublin</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.DaylightSavingsUsed</Name>
+	<Value xsi:type="xsd:boolean">0</Value>
+</ParameterValueStruct>
+</ParameterList>
+</cwmp:GetParameterValuesResponse>
+</soap:Body>
+</soap:Envelope>'
+
+            return m
         end
+
     end
 end

data/lib/cwmp/version.rb

@@ -1,3 +1,3 @@
 module Cwmp
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
 end

data/test/test_message.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/cwmp/message.rb'
+require "test/unit"
+
+class TestMessage < Test::Unit::TestCase
+
+    def test_inform
+        inform = Cwmp::Message::inform "Moonar", "130978", "00001", "1 BOOT", "0.0.1"
+        assert_equal(inform.class.to_s, "Cwmp::Message")
+    end
+
+    def test_inform_response
+        inform_response = Cwmp::Message::inform_response
+        assert(inform_response.to_s =~ /InformResponse/)
+    end
+
+end
+

data/test/test_parser.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+
+require "test/unit"
+
+class TestParser < Test::Unit::TestCase
+
+    def test_parsing_get_parameter_values_response
+        txtmsg = '<soap:Envelope
+	xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+	xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"
+	xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<soap:Header>
+	<cwmp:ID soap:mustUnderstand="1"></cwmp:ID>
+</soap:Header>
+<soap:Body>
+<cwmp:GetParameterValuesResponse>
+<ParameterList soap-enc:arrayType="cwmp:ParameterValueStruct[5]">
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.NTPServer1</Name>
+	<Value xsi:type="xsd:string">pool.ntp.org</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.CurrentLocalTime</Name>
+	<Value xsi:type="xsd:dateTime">2014-07-11T09:08:25</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.LocalTimeZone</Name>
+	<Value xsi:type="xsd:string">+00:00</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.LocalTimeZoneName</Name>
+	<Value xsi:type="xsd:string">Greenwich Mean Time : Dublin</Value>
+</ParameterValueStruct>
+<ParameterValueStruct>
+	<Name>InternetGatewayDevice.Time.DaylightSavingsUsed</Name>
+	<Value xsi:type="xsd:boolean">0</Value>
+</ParameterValueStruct>
+</ParameterList>
+</cwmp:GetParameterValuesResponse>
+</soap:Body>
+</soap:Envelope>'
+
+        msg = Cwmp::Message::parse_from_text(txtmsg)
+        assert_equal(msg.class.to_s, "Cwmp::Message")
+		assert_equal(msg.message_type, "GetParameterValuesResponse")
+    end
+
+	def test_parsing_inform
+		txtmsg = '<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Header/>
+    <soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+        <cwmp:Inform>
+            <DeviceId>
+                <Manufacturer>Moonar</Manufacturer>
+                <OUI>130978</OUI>
+                <ProductClass>Router</ProductClass>
+                <SerialNumber>00001</SerialNumber>
+            </DeviceId>
+            <Event>
+                <EventStruct>
+                    <EventCode>1 BOOT</EventCode>
+                    <CommandKey/>
+                </EventStruct>
+            </Event>
+            <MaxEnvelopes>1</MaxEnvelopes>
+            <CurrentTime>2003-01-01T05:36:55Z</CurrentTime>
+            <RetryCount>0</RetryCount>
+            <ParameterList soap-enc:arrayType="cwmp:ParameterValueStruct[7]">
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.DeviceInfo.HardwareVersion</Name>
+                    <Value xsi:type="xsd:string">MNR001</Value>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.DeviceInfo.ProvisioningCode</Name>
+                    <Value xsi:type="xsd:string">ABCD</Value>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.DeviceInfo.SoftwareVersion</Name>
+                    <Value xsi:type="xsd:string">0.0.1</Value>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.DeviceInfo.SpecVersion</Name>
+                    <Value xsi:type="xsd:string">1.0</Value>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.ManagementServer.ConnectionRequestURL</Name>
+                    <Value xsi:type="xsd:string">http://127.0.0.1:9600/00001</Value>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.ManagementServer.ParameterKey</Name>
+                    <Value xsi:type="xsd:string"/>
+                </ParameterValueStruct>
+                <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+                    <Name>InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANIPConnection.1.ExternalIPAddress
+                    </Name>
+                    <Value xsi:type="xsd:string">10.19.0.00001</Value>
+                </ParameterValueStruct>
+            </ParameterList>
+        </cwmp:Inform>
+    </soap:Body>
+</soap:Envelope>'
+
+		msg = Cwmp::Message::parse_from_text(txtmsg)
+		assert_equal(msg.class.to_s, "Cwmp::Message")
+		assert_equal(msg.message_type, "Inform")
+		assert_equal(msg.supported_model, "TR-098")
+	end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwmp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Luca Cervasio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -110,6 +110,26 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: A ruby library for parsing and crafting CWMP messages. Includes an ACS
   server and a CPE simulator.
 email: luca.cervasio@gmail.com
@@ -120,17 +140,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - bin/acs
 - bin/cpe
 - cwmp.gemspec
+- examples/api_usage.rb
 - lib/cwmp.rb
 - lib/cwmp/acs.rb
 - lib/cwmp/cpe.rb
 - lib/cwmp/message.rb
 - lib/cwmp/version.rb
+- test/test_message.rb
+- test/test_parser.rb
 homepage: https://github.com/lucacervasio/ruby-cwmp
 licenses:
 - MIT
@@ -151,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A CWMP library
 test_files: []
-has_rdoc: