brocade_vrouter 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9e6f6daa97e9d2323e40e618f41207b7a5a017
-  data.tar.gz: 9a726c4cda9ff5d28704658e0bff8fb4ec649beb
+  metadata.gz: 9ebdaf31f73486d7a464dca110e6479a1815f62c
+  data.tar.gz: 49caa01e9e6198e5822578be281148dee31a4564
 SHA512:
-  metadata.gz: 47a137fcd068a19e6759c843a5d9a2b59b3c517ba80f5e86f5b9ea2ae11bcbb11f53a44b1ab81c0cb118eda12cdf03a39f4cf2be6d38bee649117695104aca05
-  data.tar.gz: 00bd2ce3da7b1d6ecd38c3fc9c8da4ae1d06b8f36dd4ae699697931b2717bb137a84070b0e63b4480f809e65e49c6f8fc92fc37cb38c02189a941a366ebd2329
+  metadata.gz: 908a44936e03163368a5b72694be50c839740d1a449eec4afe71239bd41797dddbb305a16385e6f0ab13b8051dd07141963c08c7cbfdaf84eaad69e423b21e9f
+  data.tar.gz: 692f9bd9506ae9c95e3de77c90ea82a2a1a7b382535b22f592f93c4054eb0632061f2b9dc8a0a6712b753935f1cb59a93fc4a74668f2a6a6f834e5eb16ad371f

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.2
-before_install: gem install bundler -v 1.11.2
+  - 2.3.1
+before_install: gem install bundler -v 1.12.5

data/lib/brocade_vrouter.rb

@@ -5,6 +5,7 @@ module BrocadeVRouter
   autoload 'Client', 'brocade_vrouter/client'
   autoload 'Config', 'brocade_vrouter/config'
   autoload 'Configuration', 'brocade_vrouter/configuration'
+  autoload 'Configurator', 'brocade_vrouter/configurator'
   autoload 'PathBuilder', 'brocade_vrouter/path_builder'
 
   RequestError = Class.new StandardError

data/lib/brocade_vrouter/client.rb

@@ -18,7 +18,7 @@ module BrocadeVRouter
 
     def configuration(raise_on_fail: nil, &blk)
       raise_on_fail = BrocadeVRouter.config.raise_on_fail if raise_on_fail.nil?
-      @current_conf ||= Configuration.new connection, logger: logger
+      @current_conf ||= Configurator.new connection, logger: logger
       @current_conf.raise_on_fail = raise_on_fail
       block_given? ? @current_conf.perform(&blk) : @current_conf
     end

data/lib/brocade_vrouter/configuration.rb

@@ -1,131 +1,57 @@
+# frozen_string_literal: true
+
 module BrocadeVRouter
   class Configuration
-    CONF_PATH = 'rest/conf'.freeze
-
-    attr_reader :connection, :last_response, :logger
-    attr_accessor :raise_on_fail
-
-    def initialize(connection, base_path: nil, logger: nil, raise_on_fail: true)
-      @connection = connection
-      @base_path = base_path
-      @logger = logger
-      @raise_on_fail = raise_on_fail
-    end
-
-    def base_path
-      @base_path ||=
-        begin
-          handle_request :post, CONF_PATH
-          handle_response(connection.post "/#{CONF_PATH}").headers['location']
-        end
-    end
-
-    def perform(&blk)
-      @context = eval 'self', blk.binding
-      instance_eval(&blk) if block_given?
-    end
-
-    def set(paths = nil, &blk)
-      res = build_paths(paths, &blk).map do |p|
-        path = "#{base_path}/set/#{p}"
-        handle_request :put, path
-        handle_response connection.put path
-      end
-
-      res.size > 1 ? res : res.first
-    end
-
-    def get(paths = nil, &blk)
-      all_res = build_paths(paths, &blk).map do |p|
-        path = "#{base_path}/#{p}"
-        handle_request :get, path
-        res = handle_response connection.get path
-        res.success? ? MultiJson.load(res.body) : nil
-      end
-
-      all_res.size > 1 ? all_res : all_res.first
-    end
-
-    def delete(paths = nil, &blk)
-      res = build_paths(paths, &blk).map do |p|
-        path = "#{base_path}/delete/#{p}"
-        handle_request :put, path
-        handle_response connection.put path
-      end
+    LTSEP = ' '.freeze
+    OBRKT = '{'.freeze
+    CBRKT = '}'.freeze
+    ARRAY_FIELDS = {
+      'address' => 'address-group',
+      'port' => 'port-group'
+    }.freeze
 
-      res.size > 1 ? res : res.first
+    def initialize(data)
+      @conf = parse_lines! data.lines, []
     end
 
-    def commit(path = nil)
-      req_path = "#{path || base_path}/commit"
-      handle_request :post, req_path
-      handle_response connection.post req_path
-    rescue RequestError => e
-      raise unless e.message['No changes to commit']
-    end
-
-    def save(path = nil)
-      req_path = "#{path || base_path}/save"
-      handle_request :post, req_path
-      handle_response connection.post req_path
-    end
-
-    def close(path = nil)
-      handle_request :delete, path || base_path
-      handle_response connection.delete(path || base_path)
-    end
-
-    def close_all_sessions!(commit: false, save: false)
-      sessions.each do |session|
-        path = "#{CONF_PATH}/#{session['id']}"
-        commit path if commit
-        save path if save
-        close path
-      end
-    end
-
-    def sessions
-      (MultiJson.load (handle_response connection.get CONF_PATH).body)
-        .fetch('session', [])
-    end
-
-    def raise_on_fail?
-      @raise_on_fail
+    def to_h
+      @conf
     end
 
     private
 
-    def handle_request(method, path)
-      return unless logger
-      logger.info "> #{method.to_s.upcase} #{connection.url_prefix}#{path}"
-    end
-
-    def handle_response(resp)
-      @last_response = resp
-
-      message = "< #{resp.env.method.upcase} #{resp.env.url} #{resp.env.status}\n#{resp.body}"
-
-      if !resp.success?
-        logger.warn message if logger
-        raise RequestError.new message if raise_on_fail?
-      else
-        logger.info message if logger
+    def parse_lines!(lines, path)
+      conf = {}
+      while lines.any?
+        literals = lines.shift.split(LTSEP)
+        name = literals.shift
+        name = literals.shift if name == path.last
+
+        if name == CBRKT
+          return conf
+        elsif literals.last == OBRKT
+          if literals.first != OBRKT
+            conf[name] ||= {}
+            conf[name][literals.first] = parse_lines! lines, path + [name, literals.first]
+          else
+            conf[name] = parse_lines! lines, path + [name]
+          end
+        else
+          value = literals.join(LTSEP).tr('\'"', '')
+          if array_field?(path, name)
+            conf[name] ||= []
+            conf[name] << value
+          else
+            conf[name] = value
+          end
+        end
       end
 
-      resp
-    end
-
-    def method_missing(name, value = nil, exec = false, &blk)
-      PathBuilder.new(@context) { public_send name, value, exec, &blk }.to_a
+      conf
     end
 
-    def build_paths(paths, &blk)
-      paths = Array(paths)
-      if block_given?
-        paths.map { |p| PathBuilder.new(@context, p, &blk).to_a }.flatten
-      else
-        paths
-      end
+    def array_field?(path, name)
+      ARRAY_FIELDS[name] && path.include?(ARRAY_FIELDS[name])
     end
   end
 end

data/lib/brocade_vrouter/configurator.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+module BrocadeVRouter
+  class Configurator
+    CONF_PATH = 'rest/conf'.freeze
+
+    attr_reader :connection, :last_response, :logger
+    attr_accessor :raise_on_fail
+
+    def initialize(connection, base_path: nil, logger: nil, raise_on_fail: true)
+      @connection = connection
+      @base_path = base_path
+      @logger = logger
+      @raise_on_fail = raise_on_fail
+    end
+
+    def base_path
+      @base_path ||=
+        begin
+          handle_request :post, CONF_PATH
+          handle_response(connection.post "/#{CONF_PATH}").headers['location']
+        end
+    end
+
+    def perform(&blk)
+      @context = eval 'self', blk.binding
+      instance_eval(&blk) if block_given?
+    end
+
+    def set(paths = nil, &blk)
+      res = build_paths(paths, &blk).map do |p|
+        path = "#{base_path}/set/#{p}"
+        handle_request :put, path
+        handle_response connection.put path
+      end
+
+      res.size > 1 ? res : res.first
+    end
+
+    def get
+      res = handle_response connection.post '/rest/op/show/configuration'
+      res = handle_response connection.get "/#{res.headers['location']}" if res.success?
+      Configuration.new(res.body).to_h if res.success?
+    end
+
+    def delete(paths = nil, &blk)
+      res = build_paths(paths, &blk).map do |p|
+        path = "#{base_path}/delete/#{p}"
+        handle_request :put, path
+        handle_response connection.put path
+      end
+
+      res.size > 1 ? res : res.first
+    end
+
+    def commit(path = nil)
+      req_path = "#{path || base_path}/commit"
+      handle_request :post, req_path
+      handle_response connection.post req_path
+    rescue RequestError => e
+      raise unless e.message['No changes to commit']
+    end
+
+    def save(path = nil)
+      req_path = "#{path || base_path}/save"
+      handle_request :post, req_path
+      handle_response connection.post req_path
+    end
+
+    def close(path = nil)
+      handle_request :delete, path || base_path
+      handle_response connection.delete(path || base_path)
+    end
+
+    def close_all_sessions!(commit: false, save: false)
+      sessions.each do |session|
+        path = "#{CONF_PATH}/#{session['id']}"
+        commit path if commit
+        save path if save
+        close path
+      end
+    end
+
+    def sessions
+      (MultiJson.load (handle_response connection.get CONF_PATH).body)
+        .fetch('session', [])
+    end
+
+    def raise_on_fail?
+      @raise_on_fail
+    end
+
+    private
+
+    def handle_request(method, path)
+      return unless logger
+      logger.info "> #{method.to_s.upcase} #{connection.url_prefix}#{path}"
+    end
+
+    def handle_response(resp)
+      @last_response = resp
+
+      message = "< #{resp.env.method.upcase} #{resp.env.url} #{resp.env.status}\n#{resp.body}"
+
+      if !resp.success?
+        logger.warn message if logger
+        raise RequestError.new message if raise_on_fail?
+      else
+        logger.info message if logger
+      end
+
+      resp
+    end
+
+    def method_missing(name, value = nil, exec = false, &blk)
+      PathBuilder.new(@context) { public_send name, value, exec, &blk }.to_a
+    end
+
+    def build_paths(paths, &blk)
+      paths = Array(paths)
+      if block_given?
+        paths.map { |p| PathBuilder.new(@context, p, &blk).to_a }.flatten
+      else
+        paths
+      end
+    end
+  end
+end

data/lib/brocade_vrouter/version.rb

@@ -1,3 +1,3 @@
 module BrocadeVRouter
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brocade_vrouter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -146,6 +146,7 @@ files:
 - lib/brocade_vrouter/client.rb
 - lib/brocade_vrouter/config.rb
 - lib/brocade_vrouter/configuration.rb
+- lib/brocade_vrouter/configurator.rb
 - lib/brocade_vrouter/path_builder.rb
 - lib/brocade_vrouter/version.rb
 homepage: https://github.com/serverscom/brocade_vrouter