openstack 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f864493d851c849bb709231ab61e47e2923dfd5b
-  data.tar.gz: 2e754b1dc07e46a9194861d231db48b7e2b3add6
+  metadata.gz: d38f9aecda8d0669fc12af8dd23ffab397aa9918
+  data.tar.gz: 6a1b99ea421f84a89820153a1b2388b7d83a4302
 SHA512:
-  metadata.gz: 02dcde3c9f8c56e4027162917c260faa5d0a2286b894724157d9ba586391dd70eae4ab2004de92143b8ad7b8476fc38078b17f9f3c7db8df97bc189bef832cb3
-  data.tar.gz: bd6b76291d03319bc21d3ff5a3673423d548c189bddcabd0b0660e020a36052abc93cb4fd3ad65b5d915785729c5b84416a26a165637a0ee99298287b3e8f779
+  metadata.gz: 827c41dd88de063fb6614dcb3a09f801a632644052a4ea4f4360233eb24d41bce913c7b94b5c904bfa5048d802d932dde26931b5f3e108da22a6a5d2ca9b081e
+  data.tar.gz: 0fbea0cc05bd5e862c646ebc4b8fe09c21cfd539f06d746828c6e0b82965b486ec974448e08987cf086d20d83253f4f7fe89c756aa4756ecdd6989037050bb8a

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.2.0

data/lib/openstack.rb

@@ -33,6 +33,8 @@ module OpenStack
   require 'openstack/network/subnet'
   require 'openstack/network/router'
   require 'openstack/network/port'
+  require 'openstack/network/qos_policy'
+  require 'openstack/network/qos_bandwidth_limit_rule'
   require 'openstack/identity/connection'
   require 'openstack/identity/tenant'
   require 'openstack/identity/user'

data/lib/openstack/network/connection.rb

@@ -18,8 +18,9 @@ module Network
       @connection.authok
     end
 
-    def list_networks
-      response = @connection.req("GET", "/networks")
+    def list_networks(options = {})
+      path = options.empty? ? "/networks" : "/networks?#{options.to_query}"
+      response = @connection.req("GET", path)
       nets_hash = JSON.parse(response.body)["networks"]
       nets_hash.inject([]){|res, current| res << OpenStack::Network::Network.new(current); res}
     end
@@ -158,6 +159,27 @@ module Network
       end
     end
 
+    def create_qos_policy(options)
+      data = JSON.generate(:policy => options)
+      response = @connection.req("POST", "/qos/policies", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      OpenStack::Network::QoSPolicy.new(@connection, JSON.parse(response.body)["policy"])
+    end
+
+    def list_qos_policies(options = {})
+      path = options.empty? ? "/qos/policies" : "/qos/policies?#{options.to_query}"
+      response = @connection.req("GET", path)
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      qos_hash = JSON.parse(response.body)["policies"]
+      qos_hash.inject([]){|res, current| res << OpenStack::Network::QoSPolicy.new(@connection, current); res}
+    end
+
+    def get_qos_policy(policy_id)
+      response = @connection.req("GET", "/qos/policies/#{policy_id}")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      OpenStack::Network::QoSPolicy.new(@connection, JSON.parse(response.body)["policy"])
+    end
+
   end
 
 end

data/lib/openstack/network/port.rb

@@ -12,6 +12,7 @@ module Network
     attr_reader :device_id
     attr_reader :device_owner
     attr_reader :tenant_id
+    attr_reader :qos_policy_id
 
     def initialize(port_hash={})
       @id = port_hash["id"]
@@ -24,6 +25,7 @@ module Network
       @device_id = port_hash["device_id"]
       @device_owner = port_hash["device_owner"]
       @tenant_id = port_hash["tenant_id"]
+      @qos_policy_id = port_hash["qos_policy_id"]
     end
 
 

data/lib/openstack/network/qos_bandwidth_limit_rule.rb

@@ -0,0 +1,44 @@
+module OpenStack
+module Network
+  class QoSBandwidthLimitRule
+
+    attr_reader :id
+    attr_reader :policy_id
+    attr_reader :max_kbps
+    attr_reader :max_burst_kbps
+
+    def initialize(policy, rule_hash={})
+      @policy = policy
+      populate(rule_hash)
+    end
+
+    def populate(rule_hash=nil)
+      if @id and not rule_hash
+        response = @policy.connection.req("GET", "/qos/policies/#{@policy_id}/bandwidth_limit_rules/#{@id}")
+        OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+        rule_hash = JSON.parse(response.body)["bandwidth_limit_rule"]
+      end
+
+      @id = rule_hash["id"]
+      @policy_id = rule_hash["policy_id"] || @policy.id
+      @max_kbps = rule_hash["max_kbps"]
+      @max_burst_kbps = rule_hash["max_burst_kbps"]
+    end
+
+    def delete!
+      response = @policy.connection.req('DELETE', "/qos/policies/#{@policy_id}/bandwidth_limit_rules/#{@id}")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+    def update(options)
+      data = JSON.generate(:bandwidth_limit_rule => options)
+      response = @policy.connection.req("PUT", "/qos/policies/#{@policy_id}/bandwidth_limit_rules/#{@id}", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      populate(JSON.parse(response.body)["bandwidth_limit_rule"])
+      true
+    end
+
+  end
+end
+end

data/lib/openstack/network/qos_policy.rb

@@ -0,0 +1,80 @@
+module OpenStack
+module Network
+  class QoSPolicy
+
+    attr_reader :connection
+    attr_reader :tenant_id
+    attr_reader :id
+    attr_reader :name
+    attr_reader :description
+    attr_reader :shared
+
+    def initialize(connection, qos_hash={})
+      @connection = connection
+      populate(qos_hash)
+    end
+
+    def populate(qos_hash=nil)
+      if @id and not qos_hash
+        response = @connection.req("GET", "/qos/policies/#{@id}")
+        OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+        qos_hash = JSON.parse(response.body)["policy"]
+      end
+
+      @id = qos_hash["id"]
+      @tenant_id = qos_hash["tenant_id"]
+      @name = qos_hash["name"]
+      @description = qos_hash["description"]
+      @shared = qos_hash["shared"]
+    end
+
+    def delete!
+      response = @connection.req('DELETE', "/qos/policies/#{@id}")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+    def update(options)
+      data = JSON.generate(:policy => options)
+      response = @connection.req("PUT", "/qos/policies/#{@id}", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      populate(JSON.parse(response.body)["policy"])
+    end
+
+    def get_bandwidth_limit_rules
+      response = @connection.req("GET", "/qos/policies/#{@id}/bandwidth_limit_rules")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      rules_hash = JSON.parse(response.body)["bandwidth_limit_rules"]
+      rules_hash.inject([]){|res, current| res << OpenStack::Network::QoSBandwidthLimitRule.new(self, current); res}
+    end
+
+    def get_bandwidth_limit_rule(rule_id)
+      response = @connection.req("GET", "/qos/policies/#{@id}/bandwidth_limit_rules/#{rule_id}")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      OpenStack::Network::QoSBandwidthLimitRule.new(self, JSON.parse(response.body)["bandwidth_limit_rule"])
+    end
+
+    def create_bandwidth_limit_rule(options)
+      data = JSON.generate(:bandwidth_limit_rule => options)
+      response = @connection.req("POST", "/qos/policies/#{@id}/bandwidth_limit_rules", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      OpenStack::Network::QoSBandwidthLimitRule.new(self, JSON.parse(response.body)["bandwidth_limit_rule"])
+    end
+
+    def add_port_id(port_id)
+        data = JSON.generate(:port => {:qos_policy_id => @id})
+        response = @connection.req("PUT", "/ports/#{port_id}", {:data => data})
+        OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+        true
+    end
+
+    def remove_port_id(port_id)
+      data = JSON.generate(:port => {:qos_policy_id => nil})
+      response = @connection.req("PUT", "/ports/#{port_id}", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      true
+    end
+
+  end
+end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Dan Prince
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -104,6 +104,8 @@ files:
 - lib/openstack/network/connection.rb
 - lib/openstack/network/network.rb
 - lib/openstack/network/port.rb
+- lib/openstack/network/qos_bandwidth_limit_rule.rb
+- lib/openstack/network/qos_policy.rb
 - lib/openstack/network/router.rb
 - lib/openstack/network/subnet.rb
 - lib/openstack/swift/connection.rb